diff -Nru akonadi-mime-19.04.3/akonadi-mime.categories akonadi-mime-17.12.3/akonadi-mime.categories
--- akonadi-mime-19.04.3/akonadi-mime.categories	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/akonadi-mime.categories	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-org.kde.pim.akonadi_serializer_mail akonadi-mime (akonadi_serializer_mail) IDENTIFIER [AKONADI_SERIALIZER_MAIL_LOG]
diff -Nru akonadi-mime-19.04.3/autotests/CMakeLists.txt akonadi-mime-17.12.3/autotests/CMakeLists.txt
--- akonadi-mime-19.04.3/autotests/CMakeLists.txt	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/autotests/CMakeLists.txt	2018-02-26 05:43:21.000000000 +0000
@@ -1,17 +1,9 @@
-include(ECMAddTests)
-
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test Widgets)
 
 add_subdirectory(messagetests)
 
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
-include_directories(
-    ${CMAKE_SOURCE_DIR}/serializers
-    ${CMAKE_BINARY_DIR}/serializers
-)
-
-
 macro(add_akonadi_isolated_test _source)
   get_filename_component(_targetName ${_source} NAME_WE)
   set(_srcList ${_source} )
@@ -20,6 +12,7 @@
   add_executable(${_targetName} ${_srcList})
   target_link_libraries(${_targetName}
     Qt5::Test
+    KF5::MailTransport
     KF5::Mime
     KF5::AkonadiMime
     Qt5::Widgets
@@ -53,14 +46,3 @@
 endif()
 
 add_subdirectory(benchmarker)
-
-ecm_add_test(mailserializerplugintest.cpp ${CMAKE_BINARY_DIR}/serializers/akonadi_serializer_mail_debug.cpp
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore KF5::AkonadiPrivate KF5::Mime Qt5::Test
-    TEST_NAME mailserializerplugintest
-)
-ecm_add_test(mailserializertest.cpp
-    ${CMAKE_SOURCE_DIR}/serializers/akonadi_serializer_mail.cpp
-    ${CMAKE_BINARY_DIR}/serializers/akonadi_serializer_mail_debug.cpp
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore KF5::AkonadiPrivate KF5::Mime Qt5::Test
-    TEST_NAME mailserializertest
-)
diff -Nru akonadi-mime-19.04.3/autotests/mailserializerplugintest.cpp akonadi-mime-17.12.3/autotests/mailserializerplugintest.cpp
--- akonadi-mime-19.04.3/autotests/mailserializerplugintest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/autotests/mailserializerplugintest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@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.
-*/
-
-#include "mailserializerplugintest.h"
-
-#include <AkonadiCore/Item>
-#include <KMime/Message>
-
-#include <QDebug>
-#include <QTest>
-
-QTEST_GUILESS_MAIN(MailSerializerPluginTest)
-
-using namespace Akonadi;
-using namespace KMime;
-
-void MailSerializerPluginTest::testMailPlugin()
-{
-    QByteArray serialized
-        = "From: sender@test.org\n"
-          "Subject: Serializer Test\n"
-          "To: receiver@test.org\n"
-          "Date: Fri, 22 Jun 2007 17:24:24 +0000\n"
-          "MIME-Version: 1.0\n"
-          "Content-Type: text/plain\n"
-          "\n"
-          "Body data.";
-
-    // deserializing
-    Item item;
-    item.setMimeType(QStringLiteral("message/rfc822"));
-    item.setPayloadFromData(serialized);
-
-    QVERIFY(item.hasPayload<KMime::Message::Ptr>());
-    KMime::Message::Ptr msg = item.payload<KMime::Message::Ptr>();
-    QVERIFY(msg != nullptr);
-
-    QCOMPARE(msg->to()->asUnicodeString(), QStringLiteral("receiver@test.org"));
-    QCOMPARE(msg->body(), QByteArray("Body data."));
-
-    // serializing
-    QByteArray data = item.payloadData();
-    QCOMPARE(data, serialized);
-}
-
-void MailSerializerPluginTest::testMessageIntegrity()
-{
-    // A message that will be slightly modified if KMime::Content::assemble() is
-    // called.  We want to avoid this, because it breaks signatures.
-    QByteArray serialized
-        = "from: sender@example.com\n"
-          "to: receiver@example.com\n"
-          "Subject: Serializer Test\n"
-          "Date: Thu, 30 Jul 2009 13:46:31 +0300\n"
-          "MIME-Version: 1.0\n"
-          "Content-type: text/plain; charset=us-ascii\n"
-          "\n"
-          "Bla bla bla.";
-
-    // Deserialize.
-    Item item;
-    item.setMimeType(QStringLiteral("message/rfc822"));
-    item.setPayloadFromData(serialized);
-
-    QVERIFY(item.hasPayload<KMime::Message::Ptr>());
-    KMime::Message::Ptr msg = item.payload<KMime::Message::Ptr>();
-    QVERIFY(msg != nullptr);
-
-    qDebug() << "original data:" << serialized;
-    qDebug() << "message content:" << msg->encodedContent();
-    QCOMPARE(msg->encodedContent(), serialized);
-
-    // Serialize.
-    QByteArray data = item.payloadData();
-    qDebug() << "original data:" << serialized;
-    qDebug() << "serialized data:" << data;
-    QCOMPARE(data, serialized);
-}
diff -Nru akonadi-mime-19.04.3/autotests/mailserializerplugintest.h akonadi-mime-17.12.3/autotests/mailserializerplugintest.h
--- akonadi-mime-19.04.3/autotests/mailserializerplugintest.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/autotests/mailserializerplugintest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@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 MAILSERIALIZERPLUGINTEST_H
-#define MAILSERIALIZERPLUGINTEST_H
-
-#include <QObject>
-
-class MailSerializerPluginTest : public QObject
-{
-    Q_OBJECT
-private Q_SLOTS:
-    void testMailPlugin();
-    void testMessageIntegrity();
-};
-
-#endif
diff -Nru akonadi-mime-19.04.3/autotests/mailserializertest.cpp akonadi-mime-17.12.3/autotests/mailserializertest.cpp
--- akonadi-mime-19.04.3/autotests/mailserializertest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/autotests/mailserializertest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,378 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@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.
-*/
-
-#include "mailserializertest.h"
-
-#include "../serializers/akonadi_serializer_mail.h"
-#include "../src/messageflags.h"
-#include "../src/messageparts.h"
-
-#include <KMime/Message>
-
-#include <QTest>
-#include <QBuffer>
-
-using namespace Akonadi;
-using namespace KMime;
-
-QTEST_GUILESS_MAIN(MailSerializerTest)
-
-void MailSerializerTest::testEnvelopeDeserialize_data()
-{
-    QTest::addColumn<int>("version");
-    QTest::addColumn<QByteArray>("data");
-    QTest::addColumn<QDateTime>("date");
-    QTest::addColumn<QString>("subject");
-    QTest::addColumn<QString>("from");
-    QTest::addColumn<QString>("sender");
-    QTest::addColumn<QString>("replyTo");
-    QTest::addColumn<QString>("to");
-    QTest::addColumn<QString>("cc");
-    QTest::addColumn<QString>("bcc");
-    QTest::addColumn<QString>("inReplyTo");
-    QTest::addColumn<QString>("messageId");
-    QTest::addColumn<QString>("references");
-
-    QTest::newRow("v1 - no references")
-        << 1
-        << QByteArray(
-        "(\"Wed, 1 Feb 2006 13:37:19 UT\" \"IMPORTANT: Akonadi Test\" ((\"Tobias Koenig\" NIL \"tokoe\" \"kde.org\")) ((\"Tobias Koenig\" NIL \"tokoe\" \"kde.org\")) NIL ((\"Ingo Kloecker\" NIL \"kloecker\" \"kde.org\")) NIL NIL NIL <{7b55527e-77f4-489d-bf18-e805be96718c}@server.kde.org>)")
-        << QDateTime(QDate(2006, 2, 1), QTime(13, 37, 19), Qt::UTC)
-        << QStringLiteral("IMPORTANT: Akonadi Test")
-        << QStringLiteral("Tobias Koenig <tokoe@kde.org>")
-        << QStringLiteral("Tobias Koenig <tokoe@kde.org>")
-        << QString()
-        << QStringLiteral("Ingo Kloecker <kloecker@kde.org>")
-        << QString() << QString() << QString()
-        << QStringLiteral("<{7b55527e-77f4-489d-bf18-e805be96718c}@server.kde.org>")
-        << QString();
-
-    QTest::newRow("v1 - with references")
-        << 1
-        << QByteArray(
-        "(\"Wed, 1 Feb 2006 13:37:19 UT\" \"IMPORTANT: Akonadi Test\" ((\"Tobias Koenig\" NIL \"tokoe\" \"kde.org\")) ((\"Tobias Koenig\" NIL \"tokoe\" \"kde.org\")) NIL ((\"Ingo Kloecker\" NIL \"kloecker\" \"kde.org\")) NIL NIL NIL <{7b55527e-77f4-489d-bf18-e805be96718c}@server.kde.org> \"<{8888827e-77f4-489d-bf18-e805be96718c}@server.kde.org> <{9999927e-77f4-489d-bf18-e805be96718c}@server.kde.org>\")")
-        << QDateTime(QDate(2006, 2, 1), QTime(13, 37, 19), Qt::UTC)
-        << QStringLiteral("IMPORTANT: Akonadi Test")
-        << QStringLiteral("Tobias Koenig <tokoe@kde.org>")
-        << QStringLiteral("Tobias Koenig <tokoe@kde.org>")
-        << QString()
-        << QStringLiteral("Ingo Kloecker <kloecker@kde.org>")
-        << QString()
-        << QString()
-        << QString()
-        << QStringLiteral("<{7b55527e-77f4-489d-bf18-e805be96718c}@server.kde.org>")
-        << QStringLiteral("<{8888827e-77f4-489d-bf18-e805be96718c}@server.kde.org> <{9999927e-77f4-489d-bf18-e805be96718c}@server.kde.org>");
-
-    QBuffer buffer;
-    buffer.open(QIODevice::WriteOnly);
-    QDataStream stream(&buffer);
-    stream << QDateTime(QDate(2015, 6, 29), QTime(23, 50, 10), Qt::UTC)
-           << QStringLiteral("Důležité: Testování Akonadi")
-           << QStringLiteral("<1234567.icameup@withthis>")
-           << QStringLiteral("<2849719.IhmDc3qecs@thor>")
-           << QStringLiteral("<1234567.icameup@withthis> <7654321.icameupwith@thistoo>")
-           << 1 << QStringLiteral("Daniel Vrátil") << QStringLiteral("dvratil") << QStringLiteral("kde.org")
-           << 1 << QStringLiteral("Daniel Vrátil") << QStringLiteral("dvratil") << QStringLiteral("kde.org")
-           << 0
-           << 1 << QStringLiteral("Volker Krause") << QStringLiteral("vkrause") << QStringLiteral("kde.org")
-           << 0
-           << 0;
-
-    QTest::newRow("v2")
-        << 2
-        << buffer.data()
-        << QDateTime(QDate(2015, 6, 29), QTime(23, 50, 10), Qt::UTC)
-        << QStringLiteral("Důležité: Testování Akonadi")
-        << QStringLiteral("Daniel Vrátil <dvratil@kde.org>")
-        << QStringLiteral("Daniel Vrátil <dvratil@kde.org>")
-        << QString()     // reply to
-        << QStringLiteral("Volker Krause <vkrause@kde.org>")
-        << QString()     // cc
-        << QString()     // bcc
-        << QStringLiteral("<1234567.icameup@withthis>")
-        << QStringLiteral("<2849719.IhmDc3qecs@thor>")
-        << QStringLiteral("<1234567.icameup@withthis> <7654321.icameupwith@thistoo>");
-}
-
-void MailSerializerTest::testEnvelopeDeserialize()
-{
-    QFETCH(int, version);
-    QFETCH(QByteArray, data);
-    QFETCH(QDateTime, date);
-    QFETCH(QString, subject);
-    QFETCH(QString, from);
-    QFETCH(QString, sender);
-    QFETCH(QString, replyTo);
-    QFETCH(QString, to);
-    QFETCH(QString, cc);
-    QFETCH(QString, bcc);
-    QFETCH(QString, inReplyTo);
-    QFETCH(QString, messageId);
-    QFETCH(QString, references);
-
-    Item i;
-    i.setMimeType(QStringLiteral("message/rfc822"));
-
-    SerializerPluginMail *serializer = new SerializerPluginMail();
-
-    // envelope
-    QBuffer buffer;
-    buffer.setData(data);
-    buffer.open(QIODevice::ReadOnly);
-    QBENCHMARK {
-        buffer.seek(0);
-        serializer->deserialize(i, MessagePart::Envelope, buffer, version);
-    }
-    QVERIFY(i.hasPayload<KMime::Message::Ptr>());
-
-    KMime::Message::Ptr msg = i.payload<KMime::Message::Ptr>();
-    QCOMPARE(msg->date()->dateTime(), date);
-    QCOMPARE(msg->subject()->asUnicodeString(), subject);
-    QCOMPARE(msg->from()->asUnicodeString(), from);
-    QCOMPARE(msg->sender()->asUnicodeString(), sender);
-    QCOMPARE(msg->replyTo()->asUnicodeString(), replyTo);
-    QCOMPARE(msg->to()->asUnicodeString(), to);
-    QCOMPARE(msg->cc()->asUnicodeString(), cc);
-    QCOMPARE(msg->bcc()->asUnicodeString(), bcc);
-    QCOMPARE(msg->inReplyTo()->asUnicodeString(), inReplyTo);
-    QCOMPARE(msg->messageID()->asUnicodeString(), messageId);
-    QCOMPARE(msg->references()->asUnicodeString(), references);
-
-    delete serializer;
-}
-
-void MailSerializerTest::testEnvelopeSerialize_data()
-{
-    QTest::addColumn<QDateTime>("date");
-    QTest::addColumn<QString>("subject");
-    QTest::addColumn<QString>("from");
-    QTest::addColumn<QString>("sender");
-    QTest::addColumn<QString>("replyTo");
-    QTest::addColumn<QString>("to");
-    QTest::addColumn<QString>("cc");
-    QTest::addColumn<QString>("bcc");
-    QTest::addColumn<QString>("inReplyTo");
-    QTest::addColumn<QString>("messageId");
-    QTest::addColumn<QString>("references");
-    QTest::addColumn<QByteArray>("data");
-
-    QBuffer buffer;
-    buffer.open(QIODevice::WriteOnly);
-    QDataStream stream(&buffer);
-    stream << QDateTime(QDate(2006, 2, 1), QTime(13, 37, 19), Qt::UTC)
-           << QStringLiteral("IMPORTANT: Akonadi Test")
-           << QString()
-           << QStringLiteral("<{7b55527e-77f4-489d-bf18-e805be96718c}@server.kde.org>")
-           << QString()
-           << 1 << QStringLiteral("Tobias Koenig") << QStringLiteral("tokoe") << QStringLiteral("kde.org")
-           << 1 << QStringLiteral("Tobias Koenig") << QStringLiteral("tokoe") << QStringLiteral("kde.org")
-           << 0
-           << 1 << QStringLiteral("Ingo Kloecker") << QStringLiteral("kloecker") << QStringLiteral("kde.org")
-           << 0
-           << 0;
-    QTest::newRow("")
-        << QDateTime(QDate(2006, 2, 1), QTime(13, 37, 19), Qt::UTC)
-        << QStringLiteral("IMPORTANT: Akonadi Test")
-        << QStringLiteral("Tobias Koenig <tokoe@kde.org>")
-        << QStringLiteral("Tobias Koenig <tokoe@kde.org>")
-        << QString()
-        << QStringLiteral("Ingo Kloecker <kloecker@kde.org>")
-        << QString()
-        << QString()
-        << QString()
-        << QStringLiteral("<{7b55527e-77f4-489d-bf18-e805be96718c}@server.kde.org>")
-        << QString()
-        << buffer.data();
-}
-
-void MailSerializerTest::testEnvelopeSerialize()
-{
-    QFETCH(QDateTime, date);
-    QFETCH(QString, subject);
-    QFETCH(QString, from);
-    QFETCH(QString, sender);
-    QFETCH(QString, replyTo);
-    QFETCH(QString, to);
-    QFETCH(QString, cc);
-    QFETCH(QString, bcc);
-    QFETCH(QString, inReplyTo);
-    QFETCH(QString, messageId);
-    QFETCH(QString, references);
-    QFETCH(QByteArray, data);
-
-    Item i;
-    i.setMimeType(QStringLiteral("message/rfc822"));
-    Message *msg = new Message();
-    msg->date()->setDateTime(date);
-    msg->subject()->fromUnicodeString(subject, "UTF-8");
-    msg->from()->fromUnicodeString(from, "UTF-8");
-    msg->sender()->fromUnicodeString(sender, "UTF-8");
-    msg->replyTo()->fromUnicodeString(replyTo, "UTF-8");
-    msg->to()->fromUnicodeString(to, "UTF-8");
-    msg->cc()->fromUnicodeString(cc, "UTF-8");
-    msg->bcc()->fromUnicodeString(bcc, "UTF-8");
-    msg->inReplyTo()->fromUnicodeString(inReplyTo, "UTF-8");
-    msg->messageID()->fromUnicodeString(messageId, "UTF-8");
-    msg->references()->fromUnicodeString(references, "UTF-8");
-    i.setPayload(KMime::Message::Ptr(msg));
-
-    SerializerPluginMail *serializer = new SerializerPluginMail();
-
-    // envelope
-    QByteArray env;
-    QBuffer buffer;
-    buffer.setBuffer(&env);
-    buffer.open(QIODevice::ReadWrite);
-    int version = 0;
-    QBENCHMARK {
-        buffer.seek(0);
-        serializer->serialize(i, MessagePart::Envelope, buffer, version);
-    }
-    QCOMPARE(env, data);
-
-    delete serializer;
-}
-
-void MailSerializerTest::testParts()
-{
-    Item item;
-    item.setMimeType(QStringLiteral("message/rfc822"));
-    KMime::Message *m = new Message;
-    KMime::Message::Ptr msg(m);
-    item.setPayload(msg);
-
-    SerializerPluginMail *serializer = new SerializerPluginMail();
-    QVERIFY(serializer->parts(item).isEmpty());
-
-    msg->setHead("foo");
-    QSet<QByteArray> parts = serializer->parts(item);
-    QCOMPARE(parts.count(), 2);
-    QVERIFY(parts.contains(MessagePart::Envelope));
-    QVERIFY(parts.contains(MessagePart::Header));
-
-    msg->setBody("bar");
-    parts = serializer->parts(item);
-    QCOMPARE(parts.count(), 3);
-    QVERIFY(parts.contains(MessagePart::Envelope));
-    QVERIFY(parts.contains(MessagePart::Header));
-    QVERIFY(parts.contains(MessagePart::Body));
-
-    delete serializer;
-}
-
-void MailSerializerTest::testHeaderFetch()
-{
-    Item i;
-    i.setMimeType(QStringLiteral("message/rfc822"));
-
-    SerializerPluginMail *serializer = new SerializerPluginMail();
-
-    QByteArray headerData("From: David Johnson <david@usermode.org>\n"
-                          "To: kde-commits@kde.org\n"
-                          "MIME-Version: 1.0\n"
-                          "Date: Sun, 01 Feb 2009 06:25:22 +0000\n"
-                          "Message-Id: <1233469522.741324.18468.nullmailer@svn.kde.org>\n"
-                          "Subject: [kde-doc-english] KDE/kdeutils/kcalc\n");
-
-    QString expectedSubject = QStringLiteral("[kde-doc-english] KDE/kdeutils/kcalc");
-    QString expectedFrom = QStringLiteral("David Johnson <david@usermode.org>");
-    QString expectedTo = QStringLiteral("kde-commits@kde.org");
-
-    // envelope
-    QBuffer buffer;
-    buffer.setData(headerData);
-    buffer.open(QIODevice::ReadOnly);
-    buffer.seek(0);
-    serializer->deserialize(i, MessagePart::Header, buffer, 0);
-    QVERIFY(i.hasPayload<KMime::Message::Ptr>());
-
-    KMime::Message::Ptr msg = i.payload<KMime::Message::Ptr>();
-    QCOMPARE(msg->subject()->asUnicodeString(), expectedSubject);
-    QCOMPARE(msg->from()->asUnicodeString(), expectedFrom);
-    QCOMPARE(msg->to()->asUnicodeString(), expectedTo);
-
-    delete serializer;
-}
-
-void MailSerializerTest::testMultiDeserialize()
-{
-    // The Body part includes the Header.
-    // When serialization is done a second time, we should already have the header deserialized.
-    // We change the header data for the second deserialization (which is an unrealistic scenario)
-    // to demonstrate that it is not deserialized again.
-
-    Item i;
-    i.setMimeType(QStringLiteral("message/rfc822"));
-
-    SerializerPluginMail *serializer = new SerializerPluginMail();
-
-    QByteArray messageData("From: David Johnson <david@usermode.org>\n"
-                           "To: kde-commits@kde.org\n"
-                           "MIME-Version: 1.0\n"
-                           "Date: Sun, 01 Feb 2009 06:25:22 +0000\n"
-                           "Subject: [kde-doc-english] KDE/kdeutils/kcalc\n"
-                           "Content-Type: text/plain\n"
-                           "\n"
-                           "This is content");
-
-    QString expectedSubject = QStringLiteral("[kde-doc-english] KDE/kdeutils/kcalc");
-    QString expectedFrom = QStringLiteral("David Johnson <david@usermode.org>");
-    QString expectedTo = QStringLiteral("kde-commits@kde.org");
-    QByteArray expectedBody("This is content");
-
-    // envelope
-    QBuffer buffer;
-    buffer.setData(messageData);
-    buffer.open(QIODevice::ReadOnly);
-    buffer.seek(0);
-    serializer->deserialize(i, MessagePart::Body, buffer, 0);
-    QVERIFY(i.hasPayload<KMime::Message::Ptr>());
-
-    KMime::Message::Ptr msg = i.payload<KMime::Message::Ptr>();
-    QCOMPARE(msg->subject()->asUnicodeString(), expectedSubject);
-    QCOMPARE(msg->from()->asUnicodeString(), expectedFrom);
-    QCOMPARE(msg->to()->asUnicodeString(), expectedTo);
-    QCOMPARE(msg->body(), expectedBody);
-
-    buffer.close();
-
-    messageData = QByteArray("From: DIFFERENT CONTACT <DIFFERENTCONTACT@example.org>\n"
-                             "To: kde-commits@kde.org\n"
-                             "MIME-Version: 1.0\n"
-                             "Date: Sun, 01 Feb 2009 06:25:22 +0000\n"
-                             "Message-Id: <1233469522.741324.18468.nullmailer@svn.kde.org>\n"
-                             "Subject: [kde-doc-english] KDE/kdeutils/kcalc\n"
-                             "Content-Type: text/plain\n"
-                             "\r\n"
-                             "This is content");
-
-    buffer.setData(messageData);
-    buffer.open(QIODevice::ReadOnly);
-    buffer.seek(0);
-
-    serializer->deserialize(i, MessagePart::Header, buffer, 0);
-    QVERIFY(i.hasPayload<KMime::Message::Ptr>());
-
-    msg = i.payload<KMime::Message::Ptr>();
-    QCOMPARE(msg->subject()->asUnicodeString(), expectedSubject);
-    QCOMPARE(msg->from()->asUnicodeString(), expectedFrom);
-    QCOMPARE(msg->to()->asUnicodeString(), expectedTo);
-
-    delete serializer;
-}
diff -Nru akonadi-mime-19.04.3/autotests/mailserializertest.h akonadi-mime-17.12.3/autotests/mailserializertest.h
--- akonadi-mime-19.04.3/autotests/mailserializertest.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/autotests/mailserializertest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@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 MAILSERIALIZERTEST_H
-#define MAILSERIALIZERTEST_H
-
-#include <QObject>
-
-class MailSerializerTest : public QObject
-{
-    Q_OBJECT
-private Q_SLOTS:
-    void testEnvelopeDeserialize_data();
-    void testEnvelopeDeserialize();
-
-    void testEnvelopeSerialize_data();
-    void testEnvelopeSerialize();
-
-    void testParts();
-    void testHeaderFetch();
-    void testMultiDeserialize();
-};
-
-#endif
diff -Nru akonadi-mime-19.04.3/autotests/messagetests/messagetest.cpp akonadi-mime-17.12.3/autotests/messagetests/messagetest.cpp
--- akonadi-mime-19.04.3/autotests/messagetests/messagetest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/autotests/messagetests/messagetest.cpp	2018-02-26 05:43:21.000000000 +0000
@@ -18,7 +18,7 @@
 */
 
 #include "messagetest.h"
-#include <QTest>
+#include <qtest.h>
 #include <QFile>
 #include <item.h>
 #include <messageflags.h>
diff -Nru akonadi-mime-19.04.3/CMakeLists.txt akonadi-mime-17.12.3/CMakeLists.txt
--- akonadi-mime-19.04.3/CMakeLists.txt	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-17.12.3/CMakeLists.txt	2018-03-06 00:28:39.000000000 +0000
@@ -1,28 +1,30 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.0)
 
-set(PIM_VERSION "5.11.3")
+set(PIM_VERSION "5.7.3")
 project(Akonadi-Mime VERSION ${PIM_VERSION})
 
 # ECM setup
-set(KF5_MIN_VERSION "5.56.0")
+set(KF5_VERSION "5.39.0")
 
-find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-set(QT_REQUIRED_VERSION "5.10.0")
+set(QT_REQUIRED_VERSION "5.8.0")
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
-
+include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
+include(ECMCoverageOption)
+
 
 set(AKONADI_MIME_VERSION ${PIM_VERSION})
-set(AKONADI_VERSION "5.11.3")
-set(KF5_MIME_VERSION "5.11.3")
+set(AKONADI_VERSION "5.7.3")
+set(KF5_MIME_VERSION "5.7.3")
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADIMIME
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-mime_version.h"
@@ -31,18 +33,17 @@
     )
 
 ########### Find packages ###########
-find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Mime ${KF5_MIME_VERSION} CONFIG REQUIRED)
 find_package(KF5ItemModels ${KF5_MIME_VERSION} CONFIG REQUIRED)
 
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 
-set( SharedMimeInfo_MINIMUM_VERSION "1.3" )
+set( SharedMimeInfo_MINIMUM_VERSION "1.0" )
 find_package(SharedMimeInfo ${SharedMimeInfo_MINIMUM_VERSION} REQUIRED)
 
 find_package(LibXslt)
@@ -55,15 +56,13 @@
 
 ########### Targets ###########
 
-# 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)
-endif()
+add_definitions(-DTRANSLATION_DOMAIN=\"libakonadi-kmime5\")
+add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 add_subdirectory(src)
-add_subdirectory(serializers)
 
 if(BUILD_TESTING)
     add_subdirectory(autotests)
@@ -93,7 +92,5 @@
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
     )
 
-install(FILES akonadi-mime.categories DESTINATION ${KDE_INSTALL_CONFDIR})
-
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 ki18n_install(po)
diff -Nru akonadi-mime-19.04.3/debian/changelog akonadi-mime-17.12.3/debian/changelog
--- akonadi-mime-19.04.3/debian/changelog	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/changelog	2019-12-12 17:45:39.000000000 +0000
@@ -1,32 +1,8 @@
-akonadi-mime (4:19.04.3-0ubuntu1) eoan; urgency=medium
+akonadi-mime (4:17.12.3-0ubuntu1~16.04.sav0) xenial; urgency=medium
 
-  * New upstream release (19.04.3)
+  * Backport to Xenial
 
- -- Rik Mills <rikmills@kubuntu.org>  Tue, 23 Jul 2019 18:53:12 +0100
-
-akonadi-mime (4:18.12.3-0ubuntu2) disco; urgency=medium
-
-  * No-change rebuild for fixed akonadi server.
-
- -- Rik Mills <rikmills@kubuntu.org>  Sun, 07 Apr 2019 17:43:55 +0100
-
-akonadi-mime (4:18.12.3-0ubuntu1) disco; urgency=medium
-
-  * New upstream release (18.12.3)
-
- -- Rik Mills <rikmills@kubuntu.org>  Sat, 16 Mar 2019 15:03:39 +0000
-
-akonadi-mime (4:18.04.3-0ubuntu1) cosmic; urgency=medium
-
-  * Install akonadi_serializer_mail moved from kdepim-runtime, and
-    add breaks/replaces
-  * New upstream release (18.03.80)
-  * New upstream release (18.04.0)
-  * New upstream release (18.04.1)
-  * New upstream release (18.04.3)
-  * debian/not-installed: Update to format required by dh_missing
-
- -- Rik Mills <rikmills@kubuntu.org>  Tue, 21 Aug 2018 18:52:31 +0100
+ -- Rob Savoury <savourytech@use.startmail.com>  Thu, 12 Dec 2019 09:45:39 -0800
 
 akonadi-mime (4:17.12.3-0ubuntu1) bionic; urgency=medium
 
diff -Nru akonadi-mime-19.04.3/debian/compat akonadi-mime-17.12.3/debian/compat
--- akonadi-mime-19.04.3/debian/compat	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/compat	2018-03-16 13:21:43.000000000 +0000
@@ -1 +1,2 @@
 9
+
diff -Nru akonadi-mime-19.04.3/debian/control akonadi-mime-17.12.3/debian/control
--- akonadi-mime-19.04.3/debian/control	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/control	2018-03-16 13:21:43.000000000 +0000
@@ -12,16 +12,16 @@
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.31.0~),
-               libkf5akonadi-dev (>= 4:19.04.3~),
+               libkf5akonadi-dev (>= 4:17.12.3~),
                libkf5dbusaddons-dev (>= 5.31.0~),
                libkf5itemmodels-dev (>= 5.31.0~),
                libkf5kio-dev (>= 5.31.0~),
-               libkf5mime-dev (>= 19.04.3~),
+               libkf5mime-dev (>= 17.12.3~),
                libxslt1-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
                qtbase5-dev (>= 5.6.1~),
-               xsltproc,
+               xsltproc
 Standards-Version: 3.9.7
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-mime
@@ -33,8 +33,6 @@
 Depends: libkf5akonadimime-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kdepim-runtime (<< 4:18.03.70~),
-Replaces: kdepim-runtime (<< 4:18.03.70~)
 Description: Akonadi MIME handling library
  This library provides MIME handling helpers using the
  Akonadi PIM data server.
@@ -44,10 +42,10 @@
 Package: libkf5akonadimime-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5akonadi-dev (>= 4:19.04.3~),
+Depends: libkf5akonadi-dev (>= 4:17.12.3~),
          libkf5akonadimime5 (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Akonadi MIME handling library
  This library provides MIME handling helpers using the
  Akonadi PIM data server.
@@ -60,15 +58,13 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kdepim-runtime (<< 4:18.03.70~),
-        kdepimlibs-data (<< 4:16.08~),
+Breaks: kdepimlibs-data (<< 4:16.08~),
         libakonadi-kf5 (<< 4:16.04.3~),
         libkf5akonadimime5 (<< 4:16.04.3~),
         libkf5akonadisocialutils5 (<< 4:16.04.3~),
         libkf5akonadixml5 (<< 4:16.04.3~),
         ${kde-l10n:all}
-Replaces: kdepim-runtime (<< 4:18.03.70~),
-          kdepimlibs-data (<< 4:16.08~),
+Replaces: kdepimlibs-data (<< 4:16.08~),
           libakonadi-kf5 (<< 4:16.04.3~),
           libkf5akonadimime5 (<< 4:16.04.3~),
           libkf5akonadisocialutils5 (<< 4:16.04.3~),
diff -Nru akonadi-mime-19.04.3/debian/libkf5akonadimime5.install akonadi-mime-17.12.3/debian/libkf5akonadimime5.install
--- akonadi-mime-19.04.3/debian/libkf5akonadimime5.install	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/libkf5akonadimime5.install	2018-03-16 13:21:43.000000000 +0000
@@ -1,3 +1,2 @@
 usr/lib/*/libKF5AkonadiMime.so.5
 usr/lib/*/libKF5AkonadiMime.so.5.*
-usr/lib/*/qt5/plugins/akonadi_serializer_mail.so
diff -Nru akonadi-mime-19.04.3/debian/libkf5akonadimime-data.install akonadi-mime-17.12.3/debian/libkf5akonadimime-data.install
--- akonadi-mime-19.04.3/debian/libkf5akonadimime-data.install	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/libkf5akonadimime-data.install	2018-03-16 13:21:43.000000000 +0000
@@ -1,5 +1,3 @@
-etc/xdg/akonadi-mime.categories
-usr/share/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 usr/share/config.kcfg/specialmailcollections.kcfg
 usr/share/locale/
 usr/share/mime/packages/x-vnd.kde.contactgroup.xml
diff -Nru akonadi-mime-19.04.3/debian/not-installed akonadi-mime-17.12.3/debian/not-installed
--- akonadi-mime-19.04.3/debian/not-installed	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/not-installed	2018-03-16 13:21:43.000000000 +0000
@@ -1,2 +1,2 @@
 # TODO: consult with upstream what to do with these they are not useful to the user
-usr/bin/akonadi_benchmarker
+./usr/bin/akonadi_benchmarker
diff -Nru akonadi-mime-19.04.3/debian/source/format akonadi-mime-17.12.3/debian/source/format
--- akonadi-mime-19.04.3/debian/source/format	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-17.12.3/debian/source/format	2018-03-16 13:21:43.000000000 +0000
@@ -1 +1,2 @@
 3.0 (quilt)
+
diff -Nru akonadi-mime-19.04.3/.gitignore akonadi-mime-17.12.3/.gitignore
--- akonadi-mime-19.04.3/.gitignore	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/.gitignore	2018-02-26 05:43:21.000000000 +0000
@@ -4,6 +4,6 @@
 *.kdev4
 .swp.*
 .*.swp
-/build*/
+/build/
 CMakeLists.txt.user*
 *.unc-backup*
diff -Nru akonadi-mime-19.04.3/po/ar/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ar/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ar/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/ar/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2014-09-12 17:16+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -137,7 +137,7 @@
 msgid "templates"
 msgstr "القوالب"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ast/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ast/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ast/libakonadi-kmime5.po	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-mime-17.12.3/po/ast/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -0,0 +1,614 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# enolp <enolp@softastur.org>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
+"PO-Revision-Date: 2016-12-19 03:03+0100\n"
+"Last-Translator: enolp <enolp@softastur.org>\n"
+"Language-Team: Asturian <alministradores@softastur.org>\n"
+"Language: ast\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"
+
+#: emptytrashcommand.cpp:60
+#, kde-format
+msgid "Empty Trash"
+msgstr ""
+
+#: emptytrashcommand.cpp:61
+#, kde-format
+msgid "Are you sure you want to empty the trash folders of all accounts?"
+msgstr ""
+
+#: markascommand.cpp:141
+#, kde-format
+msgid ""
+"Are you sure you want to mark all messages in this folder and all its "
+"subfolders?"
+msgstr ""
+
+#: markascommand.cpp:142
+#, kde-format
+msgid "Mark All Recursively"
+msgstr ""
+
+#: messagemodel.cpp:93
+#, kde-format
+msgctxt "@label"
+msgid ""
+"This model can only handle email folders. The current collection holds "
+"mimetypes: %1"
+msgstr ""
+
+#: messagemodel.cpp:117
+#, kde-format
+msgctxt "@label No size available"
+msgid "-"
+msgstr "-"
+
+#: messagemodel.cpp:154
+#, kde-format
+msgctxt "@title:column, message (e.g. email) subject"
+msgid "Subject"
+msgstr ""
+
+#: messagemodel.cpp:156
+#, kde-format
+msgctxt "@title:column, sender of message (e.g. email)"
+msgid "Sender"
+msgstr ""
+
+#: messagemodel.cpp:158
+#, kde-format
+msgctxt "@title:column, receiver of message (e.g. email)"
+msgid "Receiver"
+msgstr ""
+
+#: messagemodel.cpp:160
+#, kde-format
+msgctxt "@title:column, message (e.g. email) timestamp"
+msgid "Date"
+msgstr ""
+
+#: messagemodel.cpp:162
+#, kde-format
+msgctxt "@title:column, message (e.g. email) size"
+msgid "Size"
+msgstr ""
+
+#: removeduplicatesjob.cpp:56
+#, kde-format
+msgid "Retrieving items..."
+msgstr ""
+
+#: removeduplicatesjob.cpp:74
+#, kde-format
+msgid "Searching for duplicates..."
+msgstr ""
+
+#: removeduplicatesjob.cpp:133
+#, kde-format
+msgid "Removing duplicates..."
+msgstr ""
+
+#: specialmailcollections.cpp:147
+#, kde-format
+msgctxt "local mail folder"
+msgid "inbox"
+msgstr ""
+
+#: specialmailcollections.cpp:150
+#, kde-format
+msgctxt "local mail folder"
+msgid "outbox"
+msgstr ""
+
+#: specialmailcollections.cpp:153
+#, kde-format
+msgctxt "local mail folder"
+msgid "sent-mail"
+msgstr ""
+
+#: specialmailcollections.cpp:156
+#, kde-format
+msgctxt "local mail folder"
+msgid "trash"
+msgstr ""
+
+#: specialmailcollections.cpp:159
+#, kde-format
+msgctxt "local mail folder"
+msgid "drafts"
+msgstr ""
+
+#: specialmailcollections.cpp:162
+#, kde-format
+msgctxt "local mail folder"
+msgid "templates"
+msgstr ""
+
+#: specialmailcollectionsrequestjob.cpp:65
+#, kde-format
+msgctxt "local mail folder"
+msgid "Local Folders"
+msgstr ""
+
+#: standardmailactionmanager.cpp:127
+#, kde-format
+msgid "Add Folder..."
+msgstr ""
+
+#: standardmailactionmanager.cpp:128 standardmailactionmanager.cpp:129
+#, kde-format
+msgid "Add a new folder to the currently selected account."
+msgstr ""
+
+#: standardmailactionmanager.cpp:133
+#, kde-format
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr ""
+
+#: standardmailactionmanager.cpp:137
+#, kde-format
+msgid "Could not create folder: %1"
+msgstr ""
+
+#: standardmailactionmanager.cpp:141
+#, kde-format
+msgid "Folder creation failed"
+msgstr ""
+
+#: standardmailactionmanager.cpp:146
+#, kde-format
+msgid "Copy Folder"
+msgid_plural "Copy %1 Folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:148 standardmailactionmanager.cpp:150
+#, kde-format
+msgid "Copy the selected folders to the clipboard."
+msgstr ""
+
+#: standardmailactionmanager.cpp:153
+#, kde-format
+msgctxt "@title:window"
+msgid "Properties of Folder %1"
+msgstr ""
+
+#: standardmailactionmanager.cpp:157
+#, kde-format
+msgid "Delete Folder"
+msgid_plural "Delete %1 Folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:159 standardmailactionmanager.cpp:161
+#, kde-format
+msgid "Delete the selected folders from the account."
+msgstr ""
+
+#: standardmailactionmanager.cpp:164
+#, kde-format
+msgid "Do you really want to delete this folder and all its sub-folders?"
+msgid_plural ""
+"Do you really want to delete %1 folders and all their sub-folders?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:169
+#, kde-format
+msgctxt "@title:window"
+msgid "Delete folder?"
+msgid_plural "Delete folders?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:173
+#, kde-format
+msgid "Could not delete folder: %1"
+msgstr ""
+
+#: standardmailactionmanager.cpp:177
+#, kde-format
+msgid "Folder deletion failed"
+msgstr ""
+
+#: standardmailactionmanager.cpp:182
+#, kde-format
+msgid "Update Folder"
+msgid_plural "Update Folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:185 standardmailactionmanager.cpp:187
+#, kde-format
+msgid "Update the contents of the selected folders."
+msgstr ""
+
+#: standardmailactionmanager.cpp:191
+#, kde-format
+msgid "Cut Folder"
+msgid_plural "Cut %1 Folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:193 standardmailactionmanager.cpp:195
+#, kde-format
+msgid "Cut the selected folders from the account."
+msgstr ""
+
+#: standardmailactionmanager.cpp:199
+#, kde-format
+msgid "Folder Properties"
+msgstr ""
+
+#: standardmailactionmanager.cpp:201 standardmailactionmanager.cpp:203
+#, kde-format
+msgid "Open a dialog to edit the properties of the selected folder."
+msgstr ""
+
+#: standardmailactionmanager.cpp:207
+#, kde-format
+msgid "Copy Message"
+msgid_plural "Copy %1 Messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:209 standardmailactionmanager.cpp:211
+#, kde-format
+msgid "Copy the selected messages to the clipboard."
+msgstr ""
+
+#: standardmailactionmanager.cpp:215
+#, kde-format
+msgid "Delete Message"
+msgid_plural "Delete %1 Messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:217 standardmailactionmanager.cpp:219
+#, kde-format
+msgid "Delete the selected messages from the folder."
+msgstr ""
+
+#: standardmailactionmanager.cpp:222
+#, kde-format
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete %1 messages?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:227
+#, kde-format
+msgctxt "@title:window"
+msgid "Delete Message?"
+msgid_plural "Delete Messages?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:231
+#, kde-format
+msgid "Could not delete message: %1"
+msgstr ""
+
+#: standardmailactionmanager.cpp:235
+#, kde-format
+msgid "Message deletion failed"
+msgstr ""
+
+#: standardmailactionmanager.cpp:239
+#, kde-format
+msgid "Cut Message"
+msgid_plural "Cut %1 Messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:241 standardmailactionmanager.cpp:243
+#, kde-format
+msgid "Cut the selected message from the folder."
+msgstr ""
+
+#: standardmailactionmanager.cpp:247
+#, kde-format
+msgid "Add &Account..."
+msgstr ""
+
+#: standardmailactionmanager.cpp:249
+#, kde-format
+msgid ""
+"Add a new account<p>You will be presented with a dialog where you can select "
+"the type of the account that shall be added.</p>"
+msgstr ""
+
+#: standardmailactionmanager.cpp:254
+#, kde-format
+msgctxt "@title:window"
+msgid "Add Account"
+msgstr ""
+
+#: standardmailactionmanager.cpp:258
+#, kde-format
+msgid "Could not create account: %1"
+msgstr ""
+
+#: standardmailactionmanager.cpp:262
+#, kde-format
+msgid "Account creation failed"
+msgstr ""
+
+#: standardmailactionmanager.cpp:266
+#, kde-format
+msgid "&Delete Account"
+msgid_plural "&Delete %1 Accounts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:268
+#, kde-format
+msgid ""
+"Delete the selected accounts<p>The currently selected accounts will be "
+"deleted, along with all the messages they contain.</p>"
+msgstr ""
+
+#: standardmailactionmanager.cpp:273
+#, kde-format
+msgid "Do you really want to delete this account?"
+msgid_plural "Do you really want to delete %1 accounts?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:278
+#, kde-format
+msgctxt "@title:window"
+msgid "Delete Account?"
+msgid_plural "Delete Accounts?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:282
+#, kde-format
+msgid "Account Properties..."
+msgstr ""
+
+#: standardmailactionmanager.cpp:284
+#, kde-format
+msgid "Open a dialog to edit properties of the selected account."
+msgstr ""
+
+#: standardmailactionmanager.cpp:288
+#, kde-format
+msgid "Update Account"
+msgid_plural "Update %1 Accounts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:290
+#, kde-format
+msgid "Updates the content of all folders of the selected accounts."
+msgstr ""
+
+#: standardmailactionmanager.cpp:294
+#, kde-format
+msgid "Update This Folder and All Its Subfolders"
+msgid_plural "Update These Folders and All Their Subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: standardmailactionmanager.cpp:298 standardmailactionmanager.cpp:300
+#, kde-format
+msgid "Update the contents of the selected folders and all their subfolders."
+msgstr ""
+
+#: standardmailactionmanager.cpp:305
+#, kde-format
+msgid "Could not paste message: %1"
+msgstr ""
+
+#: standardmailactionmanager.cpp:309
+#, kde-format
+msgid "Paste failed"
+msgstr ""
+
+#: standardmailactionmanager.cpp:373
+#, kde-format
+msgid "Remove Important Mark"
+msgstr ""
+
+#: standardmailactionmanager.cpp:375 standardmailactionmanager.cpp:762
+#, kde-format
+msgid "&Mark Message as Important"
+msgstr ""
+
+#: standardmailactionmanager.cpp:386
+#, kde-format
+msgid "Remove Action Item Mark"
+msgstr ""
+
+#: standardmailactionmanager.cpp:388 standardmailactionmanager.cpp:776
+#, kde-format
+msgid "&Mark Message as Action Item"
+msgstr ""
+
+#: standardmailactionmanager.cpp:732
+#, kde-format
+msgid "&Mark Message as Read"
+msgstr ""
+
+#: standardmailactionmanager.cpp:733
+#, kde-format
+msgid "Mark as Read"
+msgstr ""
+
+#: standardmailactionmanager.cpp:734 standardmailactionmanager.cpp:735
+#, kde-format
+msgid "Mark selected messages as read."
+msgstr ""
+
+#: standardmailactionmanager.cpp:747
+#, kde-format
+msgid "&Mark Message as Unread"
+msgstr ""
+
+#: standardmailactionmanager.cpp:748
+#, kde-format
+msgid "Mark as Unread"
+msgstr ""
+
+#: standardmailactionmanager.cpp:749 standardmailactionmanager.cpp:750
+#, kde-format
+msgid "Mark selected messages as unread."
+msgstr ""
+
+#: standardmailactionmanager.cpp:763
+#, kde-format
+msgid "Mark as Important"
+msgstr ""
+
+#: standardmailactionmanager.cpp:764
+#, kde-format
+msgid "Mark selected messages as important."
+msgstr ""
+
+#: standardmailactionmanager.cpp:777
+#, kde-format
+msgid "Mark as Action Item"
+msgstr ""
+
+#: standardmailactionmanager.cpp:778 standardmailactionmanager.cpp:779
+#, kde-format
+msgid "Mark selected messages as action items."
+msgstr ""
+
+#: standardmailactionmanager.cpp:790
+#, kde-format
+msgid "Mark &All Messages as Read"
+msgstr ""
+
+#: standardmailactionmanager.cpp:791
+#, kde-format
+msgid "Mark All as Read"
+msgstr ""
+
+#: standardmailactionmanager.cpp:792 standardmailactionmanager.cpp:793
+#, kde-format
+msgid "Mark all messages as read."
+msgstr ""
+
+#: standardmailactionmanager.cpp:804
+#, kde-format
+msgid "Mark &All Messages as Read Recursively"
+msgstr ""
+
+#: standardmailactionmanager.cpp:805
+#, kde-format
+msgid "Mark All as Read Recursively"
+msgstr ""
+
+#: standardmailactionmanager.cpp:806 standardmailactionmanager.cpp:807
+#, kde-format
+msgid "Mark all messages as read recursively."
+msgstr ""
+
+#: standardmailactionmanager.cpp:818
+#, kde-format
+msgid "Mark &All Messages as Unread"
+msgstr ""
+
+#: standardmailactionmanager.cpp:819
+#, kde-format
+msgid "Mark All as Unread"
+msgstr ""
+
+#: standardmailactionmanager.cpp:820 standardmailactionmanager.cpp:821
+#, kde-format
+msgid "Mark all messages as unread."
+msgstr ""
+
+#: standardmailactionmanager.cpp:832
+#, kde-format
+msgid "Mark &All Messages as Important"
+msgstr ""
+
+#: standardmailactionmanager.cpp:833
+#, kde-format
+msgid "Mark All as Important"
+msgstr ""
+
+#: standardmailactionmanager.cpp:834 standardmailactionmanager.cpp:835
+#, kde-format
+msgid "Mark all messages as important."
+msgstr ""
+
+#: standardmailactionmanager.cpp:845
+#, kde-format
+msgid "Mark All as Action Item"
+msgstr ""
+
+#: standardmailactionmanager.cpp:846
+#, kde-format
+msgid "Mark &All Messages as Action Item"
+msgstr ""
+
+#: standardmailactionmanager.cpp:848 standardmailactionmanager.cpp:849
+#, kde-format
+msgid "Mark all messages as action items."
+msgstr ""
+
+#: standardmailactionmanager.cpp:860
+#, kde-format
+msgid "Move to &Trash"
+msgstr ""
+
+#: standardmailactionmanager.cpp:862 standardmailactionmanager.cpp:863
+#, kde-format
+msgid "Move selected messages to the trash folder."
+msgstr ""
+
+#: standardmailactionmanager.cpp:873
+#, kde-format
+msgid "Move All to &Trash"
+msgstr ""
+
+#: standardmailactionmanager.cpp:874 standardmailactionmanager.cpp:875
+#, kde-format
+msgid "Move all messages to the trash folder."
+msgstr ""
+
+#: standardmailactionmanager.cpp:884
+#, kde-format
+msgid "Remove &Duplicate Messages"
+msgstr ""
+
+#: standardmailactionmanager.cpp:885 standardmailactionmanager.cpp:886
+#, kde-format
+msgid "Remove duplicate messages."
+msgstr ""
+
+#: standardmailactionmanager.cpp:896
+#, kde-format
+msgid "Empty All &Trash Folders"
+msgstr ""
+
+#: standardmailactionmanager.cpp:897 standardmailactionmanager.cpp:898
+#, kde-format
+msgid "Permanently delete all messages from all trash folders."
+msgstr ""
+
+#: standardmailactionmanager.cpp:907
+#, kde-format
+msgid "E&mpty Trash"
+msgstr ""
+
+#: standardmailactionmanager.cpp:908 standardmailactionmanager.cpp:909
+#, kde-format
+msgid "Permanently delete all messages from the trash folder."
+msgstr ""
diff -Nru akonadi-mime-19.04.3/po/bs/libakonadi-kmime5.po akonadi-mime-17.12.3/po/bs/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/bs/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/bs/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdepimlibs\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2013-10-18 20:27+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -145,7 +145,7 @@
 msgid "templates"
 msgstr "šabloni"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ca/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ca/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ca/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/ca/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -1,5 +1,5 @@
 # Translation of libakonadi-kmime5.po to Catalan
-# Copyright (C) 2010-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2017 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.
 #
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2017-12-30 17:37+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -142,7 +142,7 @@
 msgid "templates"
 msgstr "plantilles"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -629,107 +629,3 @@
 #, kde-format
 msgid "Permanently delete all messages from the trash folder."
 msgstr "Suprimeix permanentment tots els missatges de la carpeta paperera."
-
-#~ msgid "&Mark Mail as Important"
-#~ msgstr "&Marca el correu com a important"
-
-#~ msgid "&Mark Mail as Action Item"
-#~ msgstr "&Marca el correu com un element d'acció"
-
-#~ msgid "An app that requests LocalFolders"
-#~ msgstr "Una aplicació que demana les carpetes locals"
-
-#~ msgid "Headfetcher"
-#~ msgstr "Obtén les capçaleres"
-
-#~ msgid "header fetching application"
-#~ msgstr "Aplicació que obté les capçaleres"
-
-#~ msgid "Run test on multipart data (default is singlepart)."
-#~ msgstr ""
-#~ "Executa una prova en les dades que consisteixen de múltiples parts (per "
-#~ "omissió és una sola part)."
-
-#~ msgid "IMAP server"
-#~ msgstr "Servidor IMAP"
-
-#~ msgid "Defines the port the IMAP service is running on"
-#~ msgstr "Defineix el port on s'està executant el servei IMAP"
-
-#~ msgid "Username"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "Defines the encryption type to use"
-#~ msgstr "Defineix el tipus d'encriptatge a usar"
-
-#~ msgid "Defines the authentication type to use"
-#~ msgstr "Defineix el tipus d'autenticació a usar"
-
-#~ msgid "Defines if the server side subscription is enabled"
-#~ msgstr "Defineix si la subscripció de la banda del servidor està habilitada"
-
-#~ msgid "Defines if all the IMAP data should be cached locally all the time"
-#~ msgstr ""
-#~ "Defineix si totes les dades IMAP s'han de desar en la memòria cau local "
-#~ "tot el temps"
-
-#~ msgid "Defines if interval checking is enabled."
-#~ msgstr "Defineix si l'interval de comprovació està habilitat."
-
-#~ msgid "Check interval in minutes"
-#~ msgstr "Interval de comprovació en minuts"
-
-#~ msgid ""
-#~ "Defines if the annotations, ACLs and quota information of mailboxes "
-#~ "should\n"
-#~ "             also be retrieved when the mailboxes get listed."
-#~ msgstr ""
-#~ "Defineix si les anotacions, les ACL i la informació de la quota de les "
-#~ "bústies de correu\n"
-#~ "             també s'han de recuperar en llistar les bústies de correu."
-
-#~ msgid ""
-#~ "Defines if the expunge command is issued automatically, otherwise it "
-#~ "should be\n"
-#~ "             triggered manually through the D-Bus interface."
-#~ msgstr ""
-#~ "Defineix si s'executa automàticament l'ordre d'expurgat, en cas contrari\n"
-#~ "             s'haurà d'activar manualment a través de la interfície D-Bus."
-
-#~ msgid "Define which folder is used for trash"
-#~ msgstr "Defineix quina carpeta s'usa de paperera"
-
-#~ msgid "Define if account uses the default identity"
-#~ msgstr "Defineix si el compte usa la identitat per omissió"
-
-#~ msgid "Identity account"
-#~ msgstr "Identitat del compte"
-
-#~ msgid "RID path to the mailbox to watch for changes"
-#~ msgstr "Camí RID a la bústia de correu per observar els canvis"
-
-#~ msgid "Define if server supports sieve"
-#~ msgstr "Defineix si el servidor accepta «sieve»"
-
-#~ msgid "Define if we reuse host and login configuration"
-#~ msgstr ""
-#~ "Defineix si s'ha de reutilitzar la configuració de màquina i usuari "
-#~ "d'accés"
-
-#~ msgid "Define sieve port"
-#~ msgstr "Defineix el port per «sieve»"
-
-#~ msgid "Define alternate URL"
-#~ msgstr "Defineix un URL alternatiu"
-
-#~ msgid "Define default sieve vacation filename"
-#~ msgstr "Defineix el nom de fitxer de festius per omissió de «sieve»"
-
-#~ msgid "Id of the resource containing the default special collections."
-#~ msgstr "ID del recurs que conté les col·leccions especials per defecte."
-
-#~ msgid ""
-#~ "Id of the maildir resource containing the default special collections."
-#~ msgstr ""
-#~ "ID del recurs directori de correu (maildir) que conté les col·leccions "
-#~ "especials per defecte."
diff -Nru akonadi-mime-19.04.3/po/ca@valencia/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ca@valencia/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ca@valencia/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/ca@valencia/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -1,5 +1,5 @@
 # Translation of libakonadi-kmime5.po to Catalan (Valencian)
-# Copyright (C) 2010-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2017 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.
 #
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2017-12-30 17:37+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -37,8 +37,8 @@
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr ""
-"Realment voleu marcar tots els missatges en aquesta carpeta i totes les "
-"seues subcarpetes?"
+"Realment voleu marcar tots els missatges en esta carpeta i totes les seues "
+"subcarpetes?"
 
 #: markascommand.cpp:142
 #, kde-format
@@ -52,7 +52,7 @@
 "This model can only handle email folders. The current collection holds "
 "mimetypes: %1"
 msgstr ""
-"Aquest model només pot gestionar carpetes de correu. La col·lecció actual "
+"Este model només pot gestionar carpetes de correu. La col·lecció actual "
 "conté els tipus MIME: %1"
 
 #: messagemodel.cpp:117
@@ -142,7 +142,7 @@
 msgid "templates"
 msgstr "plantilles"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -209,8 +209,7 @@
 msgid "Do you really want to delete this folder and all its sub-folders?"
 msgid_plural ""
 "Do you really want to delete %1 folders and all their sub-folders?"
-msgstr[0] ""
-"Realment voleu suprimir aquesta carpeta i totes les seues subcarpetes?"
+msgstr[0] "Realment voleu suprimir esta carpeta i totes les seues subcarpetes?"
 msgstr[1] "Realment voleu suprimir %1 carpetes i totes les seues subcarpetes?"
 
 #: standardmailactionmanager.cpp:169
@@ -376,7 +375,7 @@
 #, kde-format
 msgid "Do you really want to delete this account?"
 msgid_plural "Do you really want to delete %1 accounts?"
-msgstr[0] "Realment voleu suprimir aquest compte?"
+msgstr[0] "Realment voleu suprimir este compte?"
 msgstr[1] "Realment voleu suprimir %1 comptes?"
 
 #: standardmailactionmanager.cpp:278
@@ -414,8 +413,8 @@
 #, kde-format
 msgid "Update This Folder and All Its Subfolders"
 msgid_plural "Update These Folders and All Their Subfolders"
-msgstr[0] "Actualitza aquesta carpeta i totes les seues subcarpetes"
-msgstr[1] "Actualitza aquestes carpetes i totes les seues subcarpetes"
+msgstr[0] "Actualitza esta carpeta i totes les seues subcarpetes"
+msgstr[1] "Actualitza estes carpetes i totes les seues subcarpetes"
 
 #: standardmailactionmanager.cpp:298 standardmailactionmanager.cpp:300
 #, kde-format
@@ -629,107 +628,3 @@
 #, kde-format
 msgid "Permanently delete all messages from the trash folder."
 msgstr "Suprimeix permanentment tots els missatges de la carpeta paperera."
-
-#~ msgid "&Mark Mail as Important"
-#~ msgstr "&Marca el correu com a important"
-
-#~ msgid "&Mark Mail as Action Item"
-#~ msgstr "&Marca el correu com un element d'acció"
-
-#~ msgid "An app that requests LocalFolders"
-#~ msgstr "Una aplicació que demana les carpetes locals"
-
-#~ msgid "Headfetcher"
-#~ msgstr "Obtén les capçaleres"
-
-#~ msgid "header fetching application"
-#~ msgstr "Aplicació que obté les capçaleres"
-
-#~ msgid "Run test on multipart data (default is singlepart)."
-#~ msgstr ""
-#~ "Executa una prova en les dades que consisteixen de múltiples parts (per "
-#~ "omissió és una sola part)."
-
-#~ msgid "IMAP server"
-#~ msgstr "Servidor IMAP"
-
-#~ msgid "Defines the port the IMAP service is running on"
-#~ msgstr "Defineix el port on s'està executant el servei IMAP"
-
-#~ msgid "Username"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "Defines the encryption type to use"
-#~ msgstr "Defineix el tipus d'encriptatge a usar"
-
-#~ msgid "Defines the authentication type to use"
-#~ msgstr "Defineix el tipus d'autenticació a usar"
-
-#~ msgid "Defines if the server side subscription is enabled"
-#~ msgstr "Defineix si la subscripció de la banda del servidor està habilitada"
-
-#~ msgid "Defines if all the IMAP data should be cached locally all the time"
-#~ msgstr ""
-#~ "Defineix si totes les dades IMAP s'han de desar en la memòria cau local "
-#~ "tot el temps"
-
-#~ msgid "Defines if interval checking is enabled."
-#~ msgstr "Defineix si l'interval de comprovació està habilitat."
-
-#~ msgid "Check interval in minutes"
-#~ msgstr "Interval de comprovació en minuts"
-
-#~ msgid ""
-#~ "Defines if the annotations, ACLs and quota information of mailboxes "
-#~ "should\n"
-#~ "             also be retrieved when the mailboxes get listed."
-#~ msgstr ""
-#~ "Defineix si les anotacions, les ACL i la informació de la quota de les "
-#~ "bústies de correu\n"
-#~ "             també s'han de recuperar en llistar les bústies de correu."
-
-#~ msgid ""
-#~ "Defines if the expunge command is issued automatically, otherwise it "
-#~ "should be\n"
-#~ "             triggered manually through the D-Bus interface."
-#~ msgstr ""
-#~ "Defineix si s'executa automàticament l'ordre d'expurgat, en cas contrari\n"
-#~ "             s'haurà d'activar manualment a través de la interfície D-Bus."
-
-#~ msgid "Define which folder is used for trash"
-#~ msgstr "Defineix quina carpeta s'usa de paperera"
-
-#~ msgid "Define if account uses the default identity"
-#~ msgstr "Defineix si el compte usa la identitat per omissió"
-
-#~ msgid "Identity account"
-#~ msgstr "Identitat del compte"
-
-#~ msgid "RID path to the mailbox to watch for changes"
-#~ msgstr "Camí RID a la bústia de correu per observar els canvis"
-
-#~ msgid "Define if server supports sieve"
-#~ msgstr "Defineix si el servidor accepta «sieve»"
-
-#~ msgid "Define if we reuse host and login configuration"
-#~ msgstr ""
-#~ "Defineix si s'ha de reutilitzar la configuració de màquina i usuari "
-#~ "d'accés"
-
-#~ msgid "Define sieve port"
-#~ msgstr "Defineix el port per «sieve»"
-
-#~ msgid "Define alternate URL"
-#~ msgstr "Defineix un URL alternatiu"
-
-#~ msgid "Define default sieve vacation filename"
-#~ msgstr "Defineix el nom de fitxer de festius per omissió de «sieve»"
-
-#~ msgid "Id of the resource containing the default special collections."
-#~ msgstr "ID del recurs que conté les col·leccions especials per defecte."
-
-#~ msgid ""
-#~ "Id of the maildir resource containing the default special collections."
-#~ msgstr ""
-#~ "ID del recurs directori de correu (maildir) que conté les col·leccions "
-#~ "especials per defecte."
diff -Nru akonadi-mime-19.04.3/po/cs/libakonadi-kmime5.po akonadi-mime-17.12.3/po/cs/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/cs/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/cs/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-04 12:40+0100\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -138,7 +138,7 @@
 msgid "templates"
 msgstr "Šablony"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/da/libakonadi-kmime5.po akonadi-mime-17.12.3/po/da/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/da/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/da/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2015-12-08 18:57+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -20,12 +20,12 @@
 #: emptytrashcommand.cpp:60
 #, kde-format
 msgid "Empty Trash"
-msgstr "Tøm papirkurv"
+msgstr "Tøm affald"
 
 #: emptytrashcommand.cpp:61
 #, kde-format
 msgid "Are you sure you want to empty the trash folders of all accounts?"
-msgstr "Vil du virkelig tømme papirkurvsmapperne for alle konti?"
+msgstr "Vil du virkelig tømme affaldsmapperne for alle konti?"
 
 #: markascommand.cpp:141
 #, fuzzy, kde-format
@@ -126,7 +126,7 @@
 #, kde-format
 msgctxt "local mail folder"
 msgid "trash"
-msgstr "papirkurv"
+msgstr "affald"
 
 #: specialmailcollections.cpp:159
 #, kde-format
@@ -140,7 +140,7 @@
 msgid "templates"
 msgstr "skabeloner"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -584,7 +584,7 @@
 #: standardmailactionmanager.cpp:862 standardmailactionmanager.cpp:863
 #, kde-format
 msgid "Move selected messages to the trash folder."
-msgstr "Flyt de markerede breve til papirkurvsmappen."
+msgstr "Flyt de markerede breve til affaldsmappen."
 
 #: standardmailactionmanager.cpp:873
 #, kde-format
@@ -594,7 +594,7 @@
 #: standardmailactionmanager.cpp:874 standardmailactionmanager.cpp:875
 #, kde-format
 msgid "Move all messages to the trash folder."
-msgstr "Flyt alle breve til papirkurvsmappen."
+msgstr "Flyt alle breve til affaldsmappen."
 
 #: standardmailactionmanager.cpp:884
 #, kde-format
@@ -614,17 +614,17 @@
 #: standardmailactionmanager.cpp:897 standardmailactionmanager.cpp:898
 #, kde-format
 msgid "Permanently delete all messages from all trash folders."
-msgstr "Slet alle breve fra alle papirkurvsmapper permanent."
+msgstr "Slet alle breve fra alle affaldsmapper permanent."
 
 #: standardmailactionmanager.cpp:907
 #, kde-format
 msgid "E&mpty Trash"
-msgstr "&Tøm papirkurv"
+msgstr "&Tøm affald"
 
 #: standardmailactionmanager.cpp:908 standardmailactionmanager.cpp:909
 #, kde-format
 msgid "Permanently delete all messages from the trash folder."
-msgstr "Slet alle breve fra papirkurvsmappen permanent."
+msgstr "Slet alle breve fra affaldsmappen permanent."
 
 #~ msgid "&Mark Mail as Important"
 #~ msgstr "Markér e-mail som vigtig"
diff -Nru akonadi-mime-19.04.3/po/de/libakonadi-kmime5.po akonadi-mime-17.12.3/po/de/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/de/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/de/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-11-01 18:04+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -138,7 +138,7 @@
 msgid "templates"
 msgstr "Vorlagen"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/el/libakonadi-kmime5.po akonadi-mime-17.12.3/po/el/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/el/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-17.12.3/po/el/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2014-04-26 11:32+0300\n"
 "Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -143,7 +143,7 @@
 msgid "templates"
 msgstr "πρότυπα"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/en_GB/libakonadi-kmime5.po akonadi-mime-17.12.3/po/en_GB/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/en_GB/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/en_GB/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
-"PO-Revision-Date: 2017-12-29 15:41+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
+"PO-Revision-Date: 2017-12-29 15: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"
@@ -138,7 +138,7 @@
 msgid "templates"
 msgstr "templates"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/es/libakonadi-kmime5.po akonadi-mime-17.12.3/po/es/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/es/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/es/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-05 22:57+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <l10n-kde-es@kde.org>\n"
@@ -139,7 +139,7 @@
 msgid "templates"
 msgstr "plantillas"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/et/libakonadi-kmime5.po akonadi-mime-17.12.3/po/et/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/et/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/et/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-07-26 20:42+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -137,7 +137,7 @@
 msgid "templates"
 msgstr "mallid"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/fi/libakonadi-kmime5.po akonadi-mime-17.12.3/po/fi/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/fi/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/fi/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-11-19 15:18+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -143,7 +143,7 @@
 msgid "templates"
 msgstr "templates"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/fr/libakonadi-kmime5.po akonadi-mime-17.12.3/po/fr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/fr/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/fr/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2017-06-14 09:07+0100\n"
 "Last-Translator: Vincent Pinon <vpinon@kde.org>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -146,7 +146,7 @@
 msgid "templates"
 msgstr "modèles"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ga/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ga/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ga/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/ga/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\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"
@@ -140,7 +140,7 @@
 msgid "templates"
 msgstr ""
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/gl/libakonadi-kmime5.po akonadi-mime-17.12.3/po/gl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/gl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/gl/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2017-11-03 17:49+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -144,7 +144,7 @@
 msgid "templates"
 msgstr "modelos"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -169,7 +169,7 @@
 #: standardmailactionmanager.cpp:137
 #, kde-format
 msgid "Could not create folder: %1"
-msgstr "Non se puido crear o cartafol: %1"
+msgstr "Non foi posíbel crear o cartafol: %1"
 
 #: standardmailactionmanager.cpp:141
 #, kde-format
@@ -227,7 +227,7 @@
 #: standardmailactionmanager.cpp:173
 #, kde-format
 msgid "Could not delete folder: %1"
-msgstr "Non se puido eliminar o cartafol: %1"
+msgstr "Non foi posíbel eliminar o cartafol: %1"
 
 #: standardmailactionmanager.cpp:177
 #, kde-format
@@ -310,7 +310,7 @@
 #: standardmailactionmanager.cpp:231
 #, kde-format
 msgid "Could not delete message: %1"
-msgstr "Non se puido eliminar a mensaxe: %1"
+msgstr "Non foi posíbel eliminar a mensaxe: %1"
 
 #: standardmailactionmanager.cpp:235
 #, kde-format
@@ -352,7 +352,7 @@
 #: standardmailactionmanager.cpp:258
 #, kde-format
 msgid "Could not create account: %1"
-msgstr "Non se puido crear conta: %1"
+msgstr "Non foi posíbel crear conta: %1"
 
 #: standardmailactionmanager.cpp:262
 #, kde-format
@@ -428,7 +428,7 @@
 #: standardmailactionmanager.cpp:305
 #, kde-format
 msgid "Could not paste message: %1"
-msgstr "Non se puido pegar a mensaxe: %1"
+msgstr "Non foi posíbel pegar a mensaxe: %1"
 
 #: standardmailactionmanager.cpp:309
 #, kde-format
diff -Nru akonadi-mime-19.04.3/po/hu/libakonadi-kmime5.po akonadi-mime-17.12.3/po/hu/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/hu/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/hu/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2014-09-04 15:05+0200\n"
 "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -141,7 +141,7 @@
 msgid "templates"
 msgstr "sablonok"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ia/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ia/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ia/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/ia/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2013-06-10 14:18+0200\n"
 "Last-Translator: G.Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
@@ -140,7 +140,7 @@
 msgid "templates"
 msgstr "patronos"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/it/libakonadi-kmime5.po akonadi-mime-17.12.3/po/it/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/it/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/it/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-11-24 23:07+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -139,7 +139,7 @@
 msgid "templates"
 msgstr "modelli"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ja/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ja/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ja/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/ja/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2010-08-12 22:33-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -131,7 +131,7 @@
 msgid "templates"
 msgstr ""
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/kk/libakonadi-kmime5.po akonadi-mime-17.12.3/po/kk/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/kk/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/kk/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2013-07-11 04:17+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -140,7 +140,7 @@
 msgid "templates"
 msgstr "үлгілер"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/km/libakonadi-kmime5.po akonadi-mime-17.12.3/po/km/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/km/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/km/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2012-07-11 10:23+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer\n"
@@ -141,7 +141,7 @@
 msgid "templates"
 msgstr "ពុម្ព"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ko/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ko/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ko/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/ko/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,11 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\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"
+"Language-Team: Korean <kde@peremen.name>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -135,7 +135,7 @@
 msgid "templates"
 msgstr "템플릿"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -176,7 +176,7 @@
 #: standardmailactionmanager.cpp:148 standardmailactionmanager.cpp:150
 #, kde-format
 msgid "Copy the selected folders to the clipboard."
-msgstr "선택한 폴더를 클립보드로 복사합니다."
+msgstr "선택한 폴더를 클립보드에 복사합니다."
 
 #: standardmailactionmanager.cpp:153
 #, kde-format
@@ -260,7 +260,7 @@
 #: standardmailactionmanager.cpp:209 standardmailactionmanager.cpp:211
 #, kde-format
 msgid "Copy the selected messages to the clipboard."
-msgstr "선택한 메시지를 클립보드로 복사합니다."
+msgstr "선택한 메시지를 클립보드에 복사합니다."
 
 #: standardmailactionmanager.cpp:215
 #, kde-format
diff -Nru akonadi-mime-19.04.3/po/lt/libakonadi-kmime5.po akonadi-mime-17.12.3/po/lt/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/lt/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/lt/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2015-12-29 23:01+0200\n"
 "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>\n"
 "Language-Team: lt <kde-i18n-lt@kde.org>\n"
@@ -145,7 +145,7 @@
 msgid "templates"
 msgstr "šablonai"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/mr/libakonadi-kmime5.po akonadi-mime-17.12.3/po/mr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/mr/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/mr/libakonadi-kmime5.po	2018-03-06 00:28:38.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2013-04-12 14:48+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -134,7 +134,7 @@
 msgid "templates"
 msgstr "नमूने"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/nb/libakonadi-kmime5.po akonadi-mime-17.12.3/po/nb/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/nb/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/nb/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2014-09-23 21:53+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -138,7 +138,7 @@
 msgid "templates"
 msgstr "maler"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/nds/libakonadi-kmime5.po akonadi-mime-17.12.3/po/nds/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/nds/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/nds/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2014-08-14 00:08+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -143,7 +143,7 @@
 msgid "templates"
 msgstr "Vörlagen"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/nl/libakonadi-kmime5.po akonadi-mime-17.12.3/po/nl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/nl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/nl/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-11-20 14:23+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -136,7 +136,7 @@
 msgid "templates"
 msgstr "sjablonen"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/pl/libakonadi-kmime5.po akonadi-mime-17.12.3/po/pl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/pl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/pl/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-02 07:03+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -138,7 +138,7 @@
 msgid "templates"
 msgstr "szablony"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/pt/libakonadi-kmime5.po akonadi-mime-17.12.3/po/pt/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/pt/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/pt/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-01 12:09+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -135,7 +135,7 @@
 msgid "templates"
 msgstr "modelos"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/pt_BR/libakonadi-kmime5.po akonadi-mime-17.12.3/po/pt_BR/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/pt_BR/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/pt_BR/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-02 14:26-0300\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -141,7 +141,7 @@
 msgid "templates"
 msgstr "modelos"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ro/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ro/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ro/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/ro/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2013-01-12 09:29+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -141,7 +141,7 @@
 msgid "templates"
 msgstr "șabloane"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ru/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ru/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ru/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/ru/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -3,14 +3,13 @@
 #
 # Alexander Potashev <aspotashev@gmail.com>, 2010, 2011, 2012, 2015, 2016, 2017.
 # Alexander Lakhin <exclusion@gmail.com>, 2013.
-# Александр Яворский <yavorsky.a@t-rosta.com>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
-"PO-Revision-Date: 2018-08-14 09:44+0300\n"
-"Last-Translator: Александр Яворский <yavorsky.a@t-rosta.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
+"PO-Revision-Date: 2017-10-06 16:25+0300\n"
+"Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -34,16 +33,20 @@
 msgstr "Очистить корзины всех почтовых ящиков?"
 
 #: markascommand.cpp:141
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Do you really want to delete this folder and all its sub-folders?"
+#| msgid_plural ""
+#| "Do you really want to delete %1 folders and all their sub-folders?"
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
-msgstr "Отметить все письма в этой папке и всех её вложенных папках?"
+msgstr "Удалить %1 папку и все вложенные папки?"
 
 #: markascommand.cpp:142
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark All as Read"
 msgid "Mark All Recursively"
-msgstr "Отметить все рекурсивно"
+msgstr "Отметить все как прочитанные"
 
 #: messagemodel.cpp:93
 #, kde-format
@@ -143,7 +146,7 @@
 msgid "templates"
 msgstr "Шаблоны"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -315,13 +318,16 @@
 msgstr[3] "Удалить выбранное письмо?"
 
 #: standardmailactionmanager.cpp:227
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@title:window"
+#| msgid "Delete Message?"
+#| msgid_plural "Delete Messages?"
 msgctxt "@title:window"
 msgid "Delete Message?"
 msgid_plural "Delete Messages?"
-msgstr[0] "Удаление писем"
-msgstr[1] "Удаление писем"
-msgstr[2] "Удаление писем"
+msgstr[0] "Удаление %1 письма"
+msgstr[1] "Удаление %1 писем"
+msgstr[2] "Удаление %1 писем"
 msgstr[3] "Удаление письма"
 
 #: standardmailactionmanager.cpp:231
@@ -443,15 +449,15 @@
 #, kde-format
 msgid "Update This Folder and All Its Subfolders"
 msgid_plural "Update These Folders and All Their Subfolders"
-msgstr[0] "Обновить эти папки и все их вложенные папки"
-msgstr[1] "Обновить эти папки и все их вложенные папки"
-msgstr[2] "Обновить эти папки и все их вложенные папки"
-msgstr[3] "Обновить эту папку и все её вложенные папки"
+msgstr[0] "Обновить эти папки и все подпапки"
+msgstr[1] "Обновить эти папки и все подпапки"
+msgstr[2] "Обновить эти папки и все подпапки"
+msgstr[3] "Обновить эту папку и все подпапки"
 
 #: standardmailactionmanager.cpp:298 standardmailactionmanager.cpp:300
 #, kde-format
 msgid "Update the contents of the selected folders and all their subfolders."
-msgstr "Обновить содержимое выбранных папок и всех их вложеных папкок."
+msgstr "Обновить содержимое выбранных папок и всех их подпапок."
 
 #: standardmailactionmanager.cpp:305
 #, kde-format
@@ -554,19 +560,22 @@
 msgstr "Отметить все письма как прочитанные."
 
 #: standardmailactionmanager.cpp:804
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark &All Messages as Read"
 msgid "Mark &All Messages as Read Recursively"
-msgstr "Отметить в&се письма как прочитанные рекурсивно"
+msgstr "Отметить в&се письма как прочитанные"
 
 #: standardmailactionmanager.cpp:805
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark All as Read"
 msgid "Mark All as Read Recursively"
-msgstr "Отметить все как прочитанные рекурсивно"
+msgstr "Отметить все как прочитанные"
 
 #: standardmailactionmanager.cpp:806 standardmailactionmanager.cpp:807
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark all messages as read."
 msgid "Mark all messages as read recursively."
-msgstr "Отметить все письма как прочитанные рекурсивно."
+msgstr "Отметить все письма как прочитанные."
 
 #: standardmailactionmanager.cpp:818
 #, kde-format
diff -Nru akonadi-mime-19.04.3/po/sk/libakonadi-kmime5.po akonadi-mime-17.12.3/po/sk/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sk/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/sk/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-02 21:22+0100\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
@@ -136,7 +136,7 @@
 msgid "templates"
 msgstr "šablóny"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/sl/libakonadi-kmime5.po akonadi-mime-17.12.3/po/sl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/sl/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-11-20 12:12+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -141,7 +141,7 @@
 msgid "templates"
 msgstr "Predloge"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/sr/libakonadi-kmime5.po akonadi-mime-17.12.3/po/sr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sr/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/sr/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:11+0200\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-11 00:10+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -141,7 +141,7 @@
 msgid "templates"
 msgstr "шаблони"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/sv/libakonadi-kmime5.po akonadi-mime-17.12.3/po/sv/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sv/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-17.12.3/po/sv/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-01 15:52+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -138,7 +138,7 @@
 msgid "templates"
 msgstr "mallar"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/tr/libakonadi-kmime5.po akonadi-mime-17.12.3/po/tr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/tr/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-17.12.3/po/tr/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdepimlibs-kde4\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2017-06-05 11:43+0000\n"
 "Last-Translator: Kaan <kaanozdincer@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
@@ -143,7 +143,7 @@
 msgid "templates"
 msgstr "şablonlar"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/ug/libakonadi-kmime5.po akonadi-mime-17.12.3/po/ug/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ug/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-17.12.3/po/ug/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+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"
@@ -137,7 +137,7 @@
 msgid "templates"
 msgstr "قېلىپلار"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/uk/libakonadi-kmime5.po akonadi-mime-17.12.3/po/uk/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/uk/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-17.12.3/po/uk/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
 "PO-Revision-Date: 2016-04-01 17:27+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -140,7 +140,7 @@
 msgid "templates"
 msgstr "шаблони"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/zh_CN/libakonadi-kmime5.po akonadi-mime-17.12.3/po/zh_CN/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/zh_CN/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-17.12.3/po/zh_CN/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -5,10 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
+"PO-Revision-Date: 2018-02-28 02:27-0500\n"
+"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
-msgstr "您确定要将文件夹及其子文件夹中的所有信件标记为已读吗？"
+msgstr "您确定想要将文件夹及其子文件夹中的所有信件标记为已读吗？"
 
 #: markascommand.cpp:142
 #, kde-format
@@ -137,7 +137,7 @@
 msgid "templates"
 msgstr "模板"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
diff -Nru akonadi-mime-19.04.3/po/zh_TW/libakonadi-kmime5.po akonadi-mime-17.12.3/po/zh_TW/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/zh_TW/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-17.12.3/po/zh_TW/libakonadi-kmime5.po	2018-03-06 00:28:39.000000000 +0000
@@ -1,44 +1,48 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Franklin Weng <franklin@mail.everfocus.com.tw>, 2010.
 # Franklin Weng <franklin@goodhorse.idv.tw>, 2010, 2012, 2013.
-# pan93412 <pan93412@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
-"PO-Revision-Date: 2019-03-22 00:54+0800\n"
-"Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-11-05 03:11+0100\n"
+"PO-Revision-Date: 2013-05-30 16:23+0800\n"
+"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
+"Language-Team: Chinese Traditional <kde-tw@googlegroups.com>\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"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: emptytrashcommand.cpp:60
 #, kde-format
 msgid "Empty Trash"
-msgstr "清空垃圾桶"
+msgstr "清空資源回收桶"
 
 #: emptytrashcommand.cpp:61
 #, kde-format
 msgid "Are you sure you want to empty the trash folders of all accounts?"
-msgstr "你確定要將所有帳號的垃圾桶清空嗎？"
+msgstr "你確定要將所有帳號的資源回收桶清空嗎？"
 
 #: markascommand.cpp:141
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Do you really want to delete this folder and all its sub-folders?"
+#| msgid_plural ""
+#| "Do you really want to delete %1 folders and all their sub-folders?"
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
-msgstr "確定標記此資料夾以及其子資料夾中的所有信件？"
+msgstr "您確定要刪除這 %1 個資料夾以及它所有的子資料夾嗎？"
 
 #: markascommand.cpp:142
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark All as Read"
 msgid "Mark All Recursively"
-msgstr "遞迴標記已讀"
+msgstr "將全部標為已讀"
 
 #: messagemodel.cpp:93
 #, kde-format
@@ -121,7 +125,7 @@
 #, kde-format
 msgctxt "local mail folder"
 msgid "trash"
-msgstr "垃圾桶"
+msgstr "資源回收桶"
 
 #: specialmailcollections.cpp:159
 #, kde-format
@@ -135,7 +139,7 @@
 msgid "templates"
 msgstr "樣本"
 
-#: specialmailcollectionsrequestjob.cpp:57
+#: specialmailcollectionsrequestjob.cpp:65
 #, kde-format
 msgctxt "local mail folder"
 msgid "Local Folders"
@@ -242,9 +246,10 @@
 msgstr "從帳號內剪下選取的資料夾。"
 
 #: standardmailactionmanager.cpp:199
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Folder Properties..."
 msgid "Folder Properties"
-msgstr "資料夾屬性"
+msgstr "資料夾屬性..."
 
 #: standardmailactionmanager.cpp:201 standardmailactionmanager.cpp:203
 #, kde-format
@@ -489,19 +494,22 @@
 msgstr "標記所有的信件為已讀。"
 
 #: standardmailactionmanager.cpp:804
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark &All Messages as Read"
 msgid "Mark &All Messages as Read Recursively"
-msgstr "對所有信件遞迴標記已讀(&A)"
+msgstr "將所有郵件標為已讀(&A)"
 
 #: standardmailactionmanager.cpp:805
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark All as Read"
 msgid "Mark All as Read Recursively"
-msgstr "對所有信件遞迴標記已讀"
+msgstr "將全部標為已讀"
 
 #: standardmailactionmanager.cpp:806 standardmailactionmanager.cpp:807
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Mark all messages as read."
 msgid "Mark all messages as read recursively."
-msgstr "對所有信件遞迴標記已讀。"
+msgstr "標記所有的信件為已讀。"
 
 #: standardmailactionmanager.cpp:818
 #, kde-format
@@ -551,22 +559,22 @@
 #: standardmailactionmanager.cpp:860
 #, kde-format
 msgid "Move to &Trash"
-msgstr "移到垃圾桶(&T)"
+msgstr "移到資源回收桶(&T)"
 
 #: standardmailactionmanager.cpp:862 standardmailactionmanager.cpp:863
 #, kde-format
 msgid "Move selected messages to the trash folder."
-msgstr "將選擇的信件移入垃圾桶。"
+msgstr "將選擇的信件移入資源回收桶。"
 
 #: standardmailactionmanager.cpp:873
 #, kde-format
 msgid "Move All to &Trash"
-msgstr "全部移入垃圾桶(&T)"
+msgstr "全部移入資源回收桶(&T)"
 
 #: standardmailactionmanager.cpp:874 standardmailactionmanager.cpp:875
 #, kde-format
 msgid "Move all messages to the trash folder."
-msgstr "將所有的信件移入垃圾桶。"
+msgstr "將所有的信件移入資源回收桶。"
 
 #: standardmailactionmanager.cpp:884
 #, kde-format
@@ -581,19 +589,113 @@
 #: standardmailactionmanager.cpp:896
 #, kde-format
 msgid "Empty All &Trash Folders"
-msgstr "清空所有的垃圾桶(&T)"
+msgstr "清空所有的資源回收桶(&T)"
 
 #: standardmailactionmanager.cpp:897 standardmailactionmanager.cpp:898
 #, kde-format
 msgid "Permanently delete all messages from all trash folders."
-msgstr "永久刪除垃圾桶裡的所有信件。"
+msgstr "永久刪除資源回收桶裡的所有信件。"
 
 #: standardmailactionmanager.cpp:907
 #, kde-format
 msgid "E&mpty Trash"
-msgstr "清空垃圾桶(&M)"
+msgstr "清空資源回收桶(&M)"
 
 #: standardmailactionmanager.cpp:908 standardmailactionmanager.cpp:909
 #, kde-format
 msgid "Permanently delete all messages from the trash folder."
-msgstr "永久刪除垃圾桶裡的所有信件。"
+msgstr "永久刪除資源回收桶裡的所有信件。"
+
+#~ msgid "&Mark Mail as Important"
+#~ msgstr "將郵件標為重要(&M)"
+
+#~ msgid "&Mark Mail as Action Item"
+#~ msgstr "將郵件標為動作項目(&M)"
+
+#, fuzzy
+#~| msgid "Cut Email"
+#~| msgid_plural "Cut %1 Emails"
+#~ msgctxt "EMAIL OF TRANSLATORS"
+#~ msgid "Your emails"
+#~ msgstr "剪下 %1 封電子郵件"
+
+#~ msgid "IMAP server"
+#~ msgstr "IMAP 伺服器"
+
+#~ msgid "Defines the port the IMAP service is running on"
+#~ msgstr "定義 IMAP 服務的連接埠"
+
+#~ msgid "Username"
+#~ msgstr "使用者名稱"
+
+#~ msgid "Defines the encryption type to use"
+#~ msgstr "定義要使用的加密型態"
+
+#~ msgid "Defines the authentication type to use"
+#~ msgstr "定義要使用的認證型態"
+
+#~ msgid "Defines if the server side subscription is enabled"
+#~ msgstr "定義伺服器端的訂閱是否已開啟"
+
+#~ msgid "Defines if all the IMAP data should be cached locally all the time"
+#~ msgstr "定義是否所有 IMAP 資料都要快取在本地端。"
+
+#~ msgid "Defines if interval checking is enabled."
+#~ msgstr "定義是否要開啟間隔檢查。"
+
+#~ msgid "Check interval in minutes"
+#~ msgstr "檢查間隔（分）"
+
+#~ msgid ""
+#~ "Defines if the annotations, ACLs and quota information of mailboxes "
+#~ "should\n"
+#~ "             also be retrieved when the mailboxes get listed."
+#~ msgstr ""
+#~ "定義是否在列出信箱時，同時要取得信箱的註記、權限控制清單與大小限制資訊。"
+
+#~ msgid ""
+#~ "Defines if the expunge command is issued automatically, otherwise it "
+#~ "should be\n"
+#~ "             triggered manually through the D-Bus interface."
+#~ msgstr "定義是否要自動產生 expunge 指令，否則應該手動透過 D-Bus 介面觸發。"
+
+#~ msgid "Define which folder is used for trash"
+#~ msgstr "定義資源回收筒的資料夾"
+
+#~ msgid "Define if account uses the default identity"
+#~ msgstr "定義此帳號是否使用預設身份"
+
+#~ msgid "Identity account"
+#~ msgstr "身份帳號"
+
+#~ msgid "RID path to the mailbox to watch for changes"
+#~ msgstr "要查看變更的信箱的 RID 路徑"
+
+#~ msgid "Define if server supports sieve"
+#~ msgstr "定義伺服器端是否支援過濾"
+
+#~ msgid "Define if we reuse host and login configuration"
+#~ msgstr "定義是否重複使用主機與登入設定"
+
+#~ msgid "Define sieve port"
+#~ msgstr "定義過濾（sieve）連接埠"
+
+#~ msgid "Define alternate URL"
+#~ msgstr "定義不同的網址"
+
+#~ msgid "Define default sieve vacation filename"
+#~ msgstr "定義預設過濾假期檔名"
+
+#~ msgid "Id of the resource containing the default special collections."
+#~ msgstr "預設含預設指定收藏的資源的 Id"
+
+#~ msgid ""
+#~ "Id of the maildir resource containing the default special collections."
+#~ msgstr "預設含預設指定收藏的資源的郵件目錄 Id"
+
+#~ msgid "Copy Email"
+#~ msgid_plural "Copy %1 Emails"
+#~ msgstr[0] "複製 %1 封電子郵件"
+
+#~ msgid "Do you really want to delete the search folder '%1'?"
+#~ msgstr "您確定要刪除此搜尋資料夾 %1 嗎？"
diff -Nru akonadi-mime-19.04.3/serializers/akonadi_serializer_mail.cpp akonadi-mime-17.12.3/serializers/akonadi_serializer_mail.cpp
--- akonadi-mime-19.04.3/serializers/akonadi_serializer_mail.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/serializers/akonadi_serializer_mail.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,298 +0,0 @@
-/*
-    Copyright (c) 2007 Till Adam <adam@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.
-*/
-
-#include "akonadi_serializer_mail.h"
-#include "akonadi_serializer_mail_debug.h"
-
-#include <qplugin.h>
-#include <QDataStream>
-
-#include <KMime/Message>
-
-#include <AkonadiCore/Item>
-#include <Akonadi/KMime/MessageParts>
-#include <akonadi/private/imapparser_p.h>
-
-using namespace Akonadi;
-using namespace KMime;
-
-QString StringPool::sharedValue(const QString &value)
-{
-    QMutexLocker lock(&m_mutex);
-    QSet<QString>::const_iterator it = m_pool.constFind(value);
-    if (it != m_pool.constEnd()) {
-        return *it;
-    }
-    m_pool.insert(value);
-    return value;
-}
-
-template<typename T>
-static void parseAddrList(const QVarLengthArray<QByteArray, 16> &addrList, T *hdr, int version, StringPool &pool)
-{
-    hdr->clear();
-    const int count = addrList.count();
-    QVarLengthArray<QByteArray, 16> addr;
-    for (int i = 0; i < count; ++i) {
-        ImapParser::parseParenthesizedList(addrList[ i ], addr);
-        if (addr.count() != 4) {
-            qCWarning(AKONADI_SERIALIZER_MAIL_LOG) << "Error parsing envelope address field: " << addrList[ i ];
-            continue;
-        }
-        KMime::Types::Mailbox addrField;
-        if (version == 0) {
-            addrField.setNameFrom7Bit(addr[0]);
-        } else if (version == 1) {
-            addrField.setName(pool.sharedValue(QString::fromUtf8(addr[0])));
-        }
-        KMime::Types::AddrSpec addrSpec;
-        addrSpec.localPart = pool.sharedValue(QString::fromUtf8(addr[2]));
-        addrSpec.domain = pool.sharedValue(QString::fromUtf8(addr[3]));
-        addrField.setAddress(addrSpec);
-        hdr->addAddress(addrField);
-    }
-}
-
-template<typename T>
-static void parseAddrList(QDataStream &stream, T *hdr, int version, StringPool &pool)
-{
-    Q_UNUSED(version);
-
-    hdr->clear();
-    int count = 0;
-    stream >> count;
-    for (int i = 0; i < count; ++i) {
-        QString str;
-        KMime::Types::Mailbox mbox;
-        KMime::Types::AddrSpec addrSpec;
-        stream >> str;
-        mbox.setName(pool.sharedValue(str));
-        stream >> str;
-        addrSpec.localPart = pool.sharedValue(str);
-        stream >> str;
-        addrSpec.domain = pool.sharedValue(str);
-        mbox.setAddress(addrSpec);
-
-        hdr->addAddress(mbox);
-    }
-}
-
-bool SerializerPluginMail::deserialize(Item &item, const QByteArray &label, QIODevice &data, int version)
-{
-    if (label != MessagePart::Body && label != MessagePart::Envelope && label != MessagePart::Header) {
-        return false;
-    }
-
-    KMime::Message::Ptr msg;
-    if (!item.hasPayload()) {
-        Message *m = new  Message();
-        msg = KMime::Message::Ptr(m);
-        item.setPayload(msg);
-    } else {
-        msg = item.payload<KMime::Message::Ptr>();
-    }
-
-    if (label == MessagePart::Body) {
-        QByteArray buffer = data.readAll();
-        if (buffer.isEmpty()) {
-            return true;
-        }
-        msg->setContent(buffer);
-        msg->parse();
-    } else if (label == MessagePart::Header) {
-        QByteArray buffer = data.readAll();
-        if (buffer.isEmpty()) {
-            return true;
-        }
-        if (msg->body().isEmpty() && msg->contents().isEmpty()) {
-            msg->setHead(buffer);
-            msg->parse();
-        }
-    } else if (label == MessagePart::Envelope) {
-        if (version <= 1) {
-            QByteArray buffer = data.readAll();
-            if (buffer.isEmpty()) {
-                return true;
-            }
-            QVarLengthArray<QByteArray, 16> env;
-            ImapParser::parseParenthesizedList(buffer, env);
-            if (env.count() < 10) {
-                qCWarning(AKONADI_SERIALIZER_MAIL_LOG) << "Akonadi KMime Deserializer: Got invalid envelope: " << buffer;
-                return false;
-            }
-            Q_ASSERT(env.count() >= 10);
-            // date
-            msg->date()->from7BitString(env[0]);
-            // subject
-            msg->subject()->from7BitString(env[1]);
-            // from
-            QVarLengthArray<QByteArray, 16> addrList;
-            ImapParser::parseParenthesizedList(env[2], addrList);
-            if (!addrList.isEmpty()) {
-                parseAddrList(addrList, msg->from(), version, m_stringPool);
-            }
-            // sender
-            ImapParser::parseParenthesizedList(env[3], addrList);
-            if (!addrList.isEmpty()) {
-                parseAddrList(addrList, msg->sender(), version, m_stringPool);
-            }
-            // reply-to
-            ImapParser::parseParenthesizedList(env[4], addrList);
-            if (!addrList.isEmpty()) {
-                parseAddrList(addrList, msg->replyTo(), version, m_stringPool);
-            }
-            // to
-            ImapParser::parseParenthesizedList(env[5], addrList);
-            if (!addrList.isEmpty()) {
-                parseAddrList(addrList, msg->to(), version, m_stringPool);
-            }
-            // cc
-            ImapParser::parseParenthesizedList(env[6], addrList);
-            if (!addrList.isEmpty()) {
-                parseAddrList(addrList, msg->cc(), version, m_stringPool);
-            }
-            // bcc
-            ImapParser::parseParenthesizedList(env[7], addrList);
-            if (!addrList.isEmpty()) {
-                parseAddrList(addrList, msg->bcc(), version, m_stringPool);
-            }
-            // in-reply-to
-            msg->inReplyTo()->from7BitString(env[8]);
-            // message id
-            msg->messageID()->from7BitString(env[9]);
-            // references
-            if (env.count() > 10) {
-                msg->references()->from7BitString(env[10]);
-            }
-        } else if (version == 2) {
-            QDataStream stream(&data);
-            QDateTime dt;
-            QString str;
-
-            stream >> dt;
-            msg->date()->setDateTime(dt);
-            stream >> str;
-            msg->subject()->fromUnicodeString(str, QByteArrayLiteral("UTF-8"));
-
-            QString inReplyTo;
-            stream >> inReplyTo;
-            msg->inReplyTo()->fromUnicodeString(inReplyTo, QByteArrayLiteral("UTF-8"));
-            stream >> str;
-            msg->messageID()->fromUnicodeString(str, QByteArrayLiteral("UTF-8"));
-            stream >> str;
-            if (str == inReplyTo) {
-                msg->references()->fromIdent(msg->inReplyTo());
-            } else {
-                msg->references()->fromUnicodeString(str, QByteArrayLiteral("UTF-8"));
-            }
-
-            parseAddrList(stream, msg->from(), version, m_stringPool);
-            parseAddrList(stream, msg->sender(), version, m_stringPool);
-            parseAddrList(stream, msg->replyTo(), version, m_stringPool);
-            parseAddrList(stream, msg->to(), version, m_stringPool);
-            parseAddrList(stream, msg->cc(), version, m_stringPool);
-            parseAddrList(stream, msg->bcc(), version, m_stringPool);
-
-            if (stream.status() == QDataStream::ReadCorruptData || stream.status() == QDataStream::ReadPastEnd) {
-                qCWarning(AKONADI_SERIALIZER_MAIL_LOG) << "Akonadi KMime Deserializer: Got invalid envelope";
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-template<typename T>
-static void serializeAddrList(QDataStream &stream, T *hdr)
-{
-    const KMime::Types::Mailbox::List mb = hdr->mailboxes();
-    stream << mb.size();
-    for (const KMime::Types::Mailbox &mbox : mb) {
-        stream << mbox.name()
-               << mbox.addrSpec().localPart
-               << mbox.addrSpec().domain;
-    }
-}
-
-void SerializerPluginMail::serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version)
-{
-    version = 1;
-
-    KMime::Message::Ptr m = item.payload<KMime::Message::Ptr>();
-    if (label == MessagePart::Body) {
-        data.write(m->encodedContent());
-    } else if (label == MessagePart::Envelope) {
-        version = 2;
-        QDataStream stream(&data);
-        stream << m->date()->dateTime()
-               << m->subject()->asUnicodeString()
-               << m->inReplyTo()->asUnicodeString()
-               << m->messageID()->asUnicodeString()
-               << m->references()->asUnicodeString();
-        serializeAddrList(stream, m->from());
-        serializeAddrList(stream, m->sender());
-        serializeAddrList(stream, m->replyTo());
-        serializeAddrList(stream, m->to());
-        serializeAddrList(stream, m->cc());
-        serializeAddrList(stream, m->bcc());
-    } else if (label == MessagePart::Header) {
-        data.write(m->head());
-    }
-}
-
-QSet<QByteArray> SerializerPluginMail::parts(const Item &item) const
-{
-    QSet<QByteArray> set;
-
-    if (!item.hasPayload<KMime::Message::Ptr>()) {
-        return set;
-    }
-
-    KMime::Message::Ptr msg = item.payload<KMime::Message::Ptr>();
-    if (!msg) {
-        return set;
-    }
-
-    // FIXME: we really want "has any header" here, but the kmime api doesn't offer that yet
-    if (msg->hasContent() || msg->hasHeader("Message-ID")) {
-        set << MessagePart::Envelope << MessagePart::Header;
-        if (!msg->body().isEmpty() || !msg->contents().isEmpty()) {
-            set << MessagePart::Body;
-        }
-    }
-    return set;
-}
-
-QString SerializerPluginMail::extractGid(const Item &item) const
-{
-    if (!item.hasPayload<KMime::Message::Ptr>()) {
-        return QString();
-    }
-    const KMime::Message::Ptr msg = item.payload<KMime::Message::Ptr>();
-    KMime::Headers::MessageID *mid = msg->messageID(false);
-    if (mid) {
-        return mid->asUnicodeString();
-    } else if (KMime::Headers::Base *uid = msg->headerByType("X-Akonotes-UID")) {
-        return uid->asUnicodeString();
-    }
-    return QString();
-}
-
-#include "moc_akonadi_serializer_mail.cpp"
diff -Nru akonadi-mime-19.04.3/serializers/akonadi_serializer_mail.desktop akonadi-mime-17.12.3/serializers/akonadi_serializer_mail.desktop
--- akonadi-mime-19.04.3/serializers/akonadi_serializer_mail.desktop	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/serializers/akonadi_serializer_mail.desktop	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-[Misc]
-Name=Mail Serializer
-Name[ar]=مُسلسِل البريد
-Name[bs]=Serializator maila
-Name[ca]=Serialitzador del correu
-Name[ca@valencia]=Serialitzador del correu
-Name[da]=Serieordning af post
-Name[de]=E-Mail-Serialisierung
-Name[el]=Σειριακοποιητής αλληλογραφίας
-Name[en_GB]=Mail Serialiser
-Name[es]=Serializador de correo
-Name[et]=Kirjade jadasti
-Name[fi]=Sähköpostiserialisoija
-Name[fr]=Sérialiseur de courriers électroniques
-Name[ga]=Srathóir Ríomhphoist
-Name[gl]=Serializador de correo
-Name[hu]=Levélkezelő
-Name[ia]=Divulgator partial de posta
-Name[it]=Serializzatore posta elettronica
-Name[ja]=メール用シリアライザ
-Name[kk]=Пошта тізбектеуіші
-Name[km]=ម៉ាស៊ីន​បោះពុម្ព​សំបុត្រ
-Name[ko]=메일 시리얼라이저
-Name[lt]=Pašto serializatorius
-Name[lv]=Pasta serializētājs
-Name[nb]=E-postserialisator
-Name[nds]=Nettpost-Reegmoduul
-Name[ne]=पत्र मलानकर्ता
-Name[nl]=E-mail-serialisator
-Name[nn]=E-postserialisator
-Name[pa]=ਮੇਲ ਸੀਰੀਅਲਾਈਜ਼ਰ
-Name[pl]=Szeregowanie poczty
-Name[pt]=Serialização de E-Mail
-Name[pt_BR]=Serializador de mensagem
-Name[ro]=Serializator de poștă
-Name[ru]=Сохранение писем
-Name[sk]=Serializátor pošty
-Name[sl]=Razvrščevalnik pošte v zaporedje
-Name[sr]=Серијализатор поште
-Name[sr@ijekavian]=Серијализатор поште
-Name[sr@ijekavianlatin]=Serijalizator pošte
-Name[sr@latin]=Serijalizator pošte
-Name[sv]=E-postserialisering
-Name[tr]=E-posta Sıralandırıcı
-Name[uk]=Серіалізатор пошти
-Name[x-test]=xxMail Serializerxx
-Name[zh_CN]=邮件序列转换器
-Name[zh_TW]=信件序列器
-Comment=An Akonadi serializer plugin for mail objects
-Comment[ar]=ملحقة سَلسَلة «أكونادي» لكائنات البريد
-Comment[bs]=Akonadi dodatak serializatora za mail objekte
-Comment[ca]=Un connector de serialització de l'Akonadi per a objectes del correu
-Comment[ca@valencia]=Un connector de serialització de l'Akonadi per a objectes del correu
-Comment[da]=Et Akonadi-plugin til serieordning af postobjekter
-Comment[de]=Akonadi-Modul zur Serialisierung von E-Mail-Objekten
-Comment[el]=Ένα πρόσθετο σειριακοποιητή Akonadi για αντικείμενα αλληλογραφίας
-Comment[en_GB]=An Akonadi serialiser plugin for mail objects
-Comment[es]=Un complemento serializador de Akonadi para objetos correo
-Comment[et]=Akonadi kirjaobjektide jadastamisplugin
-Comment[fi]=Akonadi-serialisoijaliitännäinen sähköpostiobjekteille
-Comment[fr]=Un module externe Akonadi pour la sérialisation des courriers électroniques
-Comment[ga]=Breiseán srathóra Akonadi le haghaidh ríomhphoist
-Comment[gl]=Un complemento de serialización de Akonadi para obxectos correo
-Comment[hu]=Akonadi-modul levelek kezeléséhez
-Comment[ia]=Un plug-in pro divulgator partial de Akonadi pro objectos de posta
-Comment[it]=Un'estensione di Akonadi per la serializzazione di posta elettronica
-Comment[ja]=メールオブジェクトのための Akonadi シリアライザプラグイン
-Comment[kk]=Akonadi пошта нысандарының тізбектеуіш плагині
-Comment[km]=កម្មវិធី​ជំនួយ​កម្មវិធី​បោះពុម្ព Akonadi សម្រាប់​វត្ថុ​សំបុត្រ
-Comment[ko]=메일 객체를 위한 Akonadi 시리얼라이저 플러그인
-Comment[lt]=Akonadi serializatoriaus papildinys pašto objektams
-Comment[lv]=Akonadi pasta serializēšanas spraudnis
-Comment[nb]=Et Akonadi programtillegg for serialisering av e-postobjekter
-Comment[nds]=Akonadi-Inreegmoduul för Nettbreven
-Comment[ne]=पत्र वस्तुका लागि एउटा एकोनाडी मिलानकर्ता प्लगइन
-Comment[nl]=Een Akonadi serialisator-plug-in voor e-mail-objecten
-Comment[nn]=Eit Akonadi-serialisatortillegg for e-postobjekt
-Comment[pa]=ਮੇਲ ਆਬਜੈਕਟ ਲਈ ਅਕੌਂਡੀ ਸੀਰੀਲਾਈਜ਼ਰ
-Comment[pl]=Wtyczka Akonadi do szeregowania obiektów pocztowych
-Comment[pt]=Um 'plugin' de serialização do Akonadi para os objectos de e-mail
-Comment[pt_BR]=Um plugin de serialização do Akonadi para os objetos de mensagem
-Comment[ro]=Modul de serializare Akonadi pentru obiecte poștă
-Comment[ru]=Модуль сохранения писем для Akonadi
-Comment[sk]=Plugin serializátora Akonadi pre poštové objekty
-Comment[sl]=Akonadijev vstavek za razvrščanje predmetov pošte v zaporedje
-Comment[sr]=Аконадијев прикључак серијализатора за објекте поште
-Comment[sr@ijekavian]=Аконадијев прикључак серијализатора за објекте поште
-Comment[sr@ijekavianlatin]=Akonadijev priključak serijalizatora za objekte pošte
-Comment[sr@latin]=Akonadijev priključak serijalizatora za objekte pošte
-Comment[sv]=Ett insticksprogram till Akonadi för serialisering av e-postobjekt
-Comment[tr]=E-posta nesneleri için bir Akonadi sıralandırıcısı
-Comment[uk]=Додаток серіалізації Akonadi для об'єктів пошти
-Comment[x-test]=xxAn Akonadi serializer plugin for mail objectsxx
-Comment[zh_CN]=对邮件对象进行序列转换的 Akonadi 插件
-Comment[zh_TW]=信件物件的 Akonadi 序列器外掛程式
-
-[Plugin]
-Type=message/rfc822,message/news,text/x-vnd.akonadi.note
-X-Akonadi-Class=legacy;default;KMime::Message*;
-X-KDE-Library=akonadi_serializer_mail
-X-KDE-ClassName=Akonadi::SerializerPluginMail
diff -Nru akonadi-mime-19.04.3/serializers/akonadi_serializer_mail.h akonadi-mime-17.12.3/serializers/akonadi_serializer_mail.h
--- akonadi-mime-19.04.3/serializers/akonadi_serializer_mail.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/serializers/akonadi_serializer_mail.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
-    Copyright (c) 2007 Till Adam <adam@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 __AKONADI_SERIALIZER_MAIL_H__
-#define __AKONADI_SERIALIZER_MAIL_H__
-
-#include <QObject>
-#include <QMutex>
-
-#include <AkonadiCore/itemserializerplugin.h>
-#include <AkonadiCore/gidextractorinterface.h>
-
-namespace Akonadi {
-/**
- * Levare QString implicit sharing to decrease memory consumption.
- *
- * This class is thread safe. Apparenlty required for usage in
- * legacy KRes compat bridges.
- */
-class StringPool
-{
-public:
-    /**
-     * Lookup @p value in the pool and return the known value
-     * to reuse it and leverage the implicit sharing. Otherwise
-     * add the value to the pool and return it again.
-     */
-    QString sharedValue(const QString &value);
-private:
-    QMutex m_mutex;
-    QSet<QString> m_pool;
-};
-
-class SerializerPluginMail : public QObject, public ItemSerializerPlugin, public GidExtractorInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(Akonadi::ItemSerializerPlugin Akonadi::GidExtractorInterface)
-    Q_PLUGIN_METADATA(IID "org.kde.akonadi.SerializerPluginMail")
-public:
-    bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) override;
-    void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) override;
-    QSet<QByteArray> parts(const Item &item) const override;
-    QString extractGid(const Item &item) const override;
-private:
-    StringPool m_stringPool;
-};
-}
-
-#endif
diff -Nru akonadi-mime-19.04.3/serializers/CMakeLists.txt akonadi-mime-17.12.3/serializers/CMakeLists.txt
--- akonadi-mime-19.04.3/serializers/CMakeLists.txt	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/serializers/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"libakonadi-kmime5-serializer\")
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(akonadi_serializer_mail_SRCS
-    akonadi_serializer_mail.cpp
-)
-ecm_qt_declare_logging_category(akonadi_serializer_mail_SRCS
-    HEADER akonadi_serializer_mail_debug.h
-    IDENTIFIER AKONADI_SERIALIZER_MAIL_LOG
-    CATEGORY_NAME org.kde.pim.akonadi_serializer_mail
-)
-add_library(akonadi_serializer_mail MODULE ${akonadi_serializer_mail_SRCS})
-target_link_libraries(akonadi_serializer_mail
-    KF5::Mime
-    KF5::AkonadiCore
-    KF5::AkonadiMime
-    KF5::AkonadiPrivate
-)
-install(TARGETS akonadi_serializer_mail
-    DESTINATION ${KDE_INSTALL_PLUGINDIR}
-)
-install(FILES akonadi_serializer_mail.desktop
-    DESTINATION ${KDE_INSTALL_DATADIR}/akonadi/plugins/serializer
-)
diff -Nru akonadi-mime-19.04.3/serializers/Messages.sh akonadi-mime-17.12.3/serializers/Messages.sh
--- akonadi-mime-19.04.3/serializers/Messages.sh	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/serializers/Messages.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-$XGETTEXT *.cpp -o $podir/libakonadi-kmime5-serializer.pot
diff -Nru akonadi-mime-19.04.3/src/addressattribute.h akonadi-mime-17.12.3/src/addressattribute.h
--- akonadi-mime-19.04.3/src/addressattribute.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/addressattribute.h	2018-02-26 05:43:21.000000000 +0000
@@ -48,7 +48,7 @@
     /**
       Destroys the AddressAttribute.
     */
-    ~AddressAttribute() override;
+    virtual ~AddressAttribute();
 
     /* reimpl */
     AddressAttribute *clone() const override;
diff -Nru akonadi-mime-19.04.3/src/CMakeLists.txt akonadi-mime-17.12.3/src/CMakeLists.txt
--- akonadi-mime-19.04.3/src/CMakeLists.txt	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/CMakeLists.txt	2018-02-26 05:43:21.000000000 +0000
@@ -1,4 +1,3 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"libakonadi-kmime5\")
 # generates a D-Bus interface description from a KConfigXT file
 macro(kcfg_generate_dbus_interface _kcfg _name)
     add_custom_command(
diff -Nru akonadi-mime-19.04.3/src/markascommand.h akonadi-mime-17.12.3/src/markascommand.h
--- akonadi-mime-19.04.3/src/markascommand.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/markascommand.h	2018-02-26 05:43:21.000000000 +0000
@@ -37,7 +37,7 @@
 public:
     MarkAsCommand(const Akonadi::MessageStatus &targetStatus, const Akonadi::Item::List &msgList, bool invert = false, QObject *parent = nullptr);
     MarkAsCommand(const Akonadi::MessageStatus &targetStatus, const Akonadi::Collection::List &folders, bool invert = false, bool recursive = false, QObject *parent = nullptr);
-    ~MarkAsCommand() override;
+    ~MarkAsCommand();
     void execute() override;
 
 private Q_SLOTS:
diff -Nru akonadi-mime-19.04.3/src/messagemodel.h akonadi-mime-17.12.3/src/messagemodel.h
--- akonadi-mime-19.04.3/src/messagemodel.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/messagemodel.h	2018-02-26 05:43:21.000000000 +0000
@@ -61,32 +61,32 @@
     /**
       Deletes the message model.
     */
-    ~MessageModel() override;
+    virtual ~MessageModel();
 
     /**
       Reimplemented from QAbstractItemModel.
      */
-    Q_REQUIRED_RESULT int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     /**
       Reimplemented from QAbstractItemModel.
      */
-    Q_REQUIRED_RESULT int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
     /**
       Reimplemented from QAbstractItemModel.
      */
-    Q_REQUIRED_RESULT QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
     /**
       Reimplemented from QAbstractItemModel.
      */
-    Q_REQUIRED_RESULT QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
     /**
       Reimplemented from QAbstractItemModel.
      */
-    Q_REQUIRED_RESULT QStringList mimeTypes() const override;
+    QStringList mimeTypes() const override;
 };
 }
 
diff -Nru akonadi-mime-19.04.3/src/messagestatus.h akonadi-mime-17.12.3/src/messagestatus.h
--- akonadi-mime-19.04.3/src/messagestatus.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/messagestatus.h	2018-02-26 05:43:21.000000000 +0000
@@ -96,92 +96,92 @@
     /** Check for Unknown status.
         @return true if status is unknown.
     */
-    Q_REQUIRED_RESULT bool isOfUnknownStatus() const;
+    bool isOfUnknownStatus() const;
 
     /** Check for Read status. Note that ignored messages are read.
         @return true if status is read.
     */
-    Q_REQUIRED_RESULT bool isRead() const;
+    bool isRead() const;
 
     /** Check for Deleted status.
         @return true if status is deleted.
     */
-    Q_REQUIRED_RESULT bool isDeleted() const;
+    bool isDeleted() const;
 
     /** Check for Replied status.
         @return true if status is replied.
     */
-    Q_REQUIRED_RESULT bool isReplied() const;
+    bool isReplied() const;
 
     /** Check for Forwarded status.
         @return true if status is forwarded.
     */
-    Q_REQUIRED_RESULT bool isForwarded() const;
+    bool isForwarded() const;
 
     /** Check for Queued status.
         @return true if status is queued.
     */
-    Q_REQUIRED_RESULT bool isQueued() const;
+    bool isQueued() const;
 
     /** Check for Sent status.
         @return true if status is sent.
     */
-    Q_REQUIRED_RESULT bool isSent() const;
+    bool isSent() const;
 
     /** Check for Important status.
         @return true if status is important.
     */
-    Q_REQUIRED_RESULT bool isImportant() const;
+    bool isImportant() const;
 
     /** Check for Watched status.
         @return true if status is watched.
     */
-    Q_REQUIRED_RESULT bool isWatched() const;
+    bool isWatched() const;
 
     /** Check for Ignored status.
         @return true if status is ignored.
     */
-    Q_REQUIRED_RESULT bool isIgnored() const;
+    bool isIgnored() const;
 
     /** Check for ToAct status.
         @return true if status is action item.
     */
-    Q_REQUIRED_RESULT bool isToAct() const;
+    bool isToAct() const;
 
     /** Check for Spam status.
         @return true if status is spam.
     */
-    Q_REQUIRED_RESULT bool isSpam() const;
+    bool isSpam() const;
 
     /** Check for Ham status.
         @return true if status is not spam.
     */
-    Q_REQUIRED_RESULT bool isHam() const;
+    bool isHam() const;
 
     /** Check for Attachment status.
         @return true if status indicates an attachment.
     */
-    Q_REQUIRED_RESULT bool hasAttachment() const;
+    bool hasAttachment() const;
 
     /** Check for Invitation status.
         @return true if status indicates an invitation.
     */
-    Q_REQUIRED_RESULT bool hasInvitation() const;
+    bool hasInvitation() const;
 
     /** Check for Signed status.
         @return true if status is signed.
     */
-    Q_REQUIRED_RESULT bool isSigned() const;
+    bool isSigned() const;
 
     /** Check for Encrypted status.
         @return true if status is encrypted.
     */
-    Q_REQUIRED_RESULT bool isEncrypted() const;
+    bool isEncrypted() const;
 
     /** Check for error status.
         @return true if status indicates an error.
     */
-    Q_REQUIRED_RESULT bool hasError() const;
+    bool hasError() const;
 
     /* ----- setters ----------------------------------------------------- */
 
@@ -278,7 +278,7 @@
      all integrity checks in the setter methods.
      @return The status encoded in bits.
      */
-    Q_REQUIRED_RESULT qint32 toQInt32() const;
+    qint32 toQInt32() const;
 
     /** Set the status as a whole e.g. for reading from an index.
         Don't manipulte the index via this value, this bypasses
@@ -293,7 +293,7 @@
 
         @note This code is legacy for the KMail1 indexes
     */
-    Q_REQUIRED_RESULT QString statusStr() const;
+    QString statusStr() const;
 
     /** Set the status based on a string representation.
         @param aStr The status string to be analyzed.
@@ -307,7 +307,7 @@
     /** Get the status as a whole e.g. for storage as IMAP flags.
         @return The status encoded in flags.
     */
-    Q_REQUIRED_RESULT QSet<QByteArray> statusFlags() const;
+    QSet<QByteArray> statusFlags() const;
 
     /** Set the status as a whole e.g. for reading from IMAP flags.
         @param flags set of flags for status as a whole
diff -Nru akonadi-mime-19.04.3/src/movecommand.h akonadi-mime-17.12.3/src/movecommand.h
--- akonadi-mime-19.04.3/src/movecommand.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/movecommand.h	2018-02-26 05:43:21.000000000 +0000
@@ -33,7 +33,7 @@
     Q_OBJECT
 public:
     MoveCommand(const Akonadi::Collection &destFolder, const Akonadi::Item::List &msgList, QObject *parent = nullptr);
-    ~MoveCommand() override;
+    ~MoveCommand();
     void execute() override;
 
 private Q_SLOTS:
diff -Nru akonadi-mime-19.04.3/src/removeduplicatesjob.cpp akonadi-mime-17.12.3/src/removeduplicatesjob.cpp
--- akonadi-mime-19.04.3/src/removeduplicatesjob.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/removeduplicatesjob.cpp	2018-02-26 05:43:21.000000000 +0000
@@ -32,9 +32,9 @@
 {
 public:
     Private(RemoveDuplicatesJob *parent)
-        : mCurrentJob(nullptr)
-        , mJobCount(0)
+        : mJobCount(0)
         , mKilled(false)
+        , mCurrentJob(nullptr)
         , mParent(parent)
     {
     }
@@ -149,10 +149,10 @@
     }
 
     Akonadi::Collection::List mFolders;
-    Akonadi::Item::List mDuplicateItems;
-    Akonadi::Job *mCurrentJob = nullptr;
     int mJobCount;
+    Akonadi::Item::List mDuplicateItems;
     bool mKilled = false;
+    Akonadi::Job *mCurrentJob = nullptr;
 
 private:
     RemoveDuplicatesJob *mParent = nullptr;
@@ -183,7 +183,7 @@
 
 void RemoveDuplicatesJob::doStart()
 {
-    qCDebug(AKONADIMIME_LOG) << " void RemoveDuplicatesJob::doStart()";
+    qCDebug(AKONADIMIME_LOG);
 
     if (d->mFolders.isEmpty()) {
         qCWarning(AKONADIMIME_LOG) << "No collections to process";
diff -Nru akonadi-mime-19.04.3/src/removeduplicatesjob.h akonadi-mime-17.12.3/src/removeduplicatesjob.h
--- akonadi-mime-19.04.3/src/removeduplicatesjob.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/removeduplicatesjob.h	2018-02-26 05:43:21.000000000 +0000
@@ -59,7 +59,7 @@
     /**
      * Destroys the job.
      */
-    ~RemoveDuplicatesJob() override;
+    virtual ~RemoveDuplicatesJob();
 
 protected:
     void doStart() override;
diff -Nru akonadi-mime-19.04.3/src/specialmailcollections.h akonadi-mime-17.12.3/src/specialmailcollections.h
--- akonadi-mime-19.04.3/src/specialmailcollections.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/specialmailcollections.h	2018-02-26 05:43:21.000000000 +0000
@@ -95,20 +95,20 @@
      * Returns whether the given agent @p instance has a special collection of
      * the given @p type.
      */
-    Q_REQUIRED_RESULT bool hasCollection(Type type, const AgentInstance &instance) const;
+    bool hasCollection(Type type, const AgentInstance &instance) const;
 
     /**
      * Returns the special mail collection of the given @p type in the given agent
      * @p instance, or an invalid collection if such a collection is unknown.
      */
-    Q_REQUIRED_RESULT Akonadi::Collection collection(Type type, const AgentInstance &instance) const;
+    Akonadi::Collection collection(Type type, const AgentInstance &instance) const;
 
     /**
      * Returns the special collection type for a given collection, or empty if the collection
      * doesn't have a special type.
      * @since 4.11
      */
-    Q_REQUIRED_RESULT static Type specialCollectionType(const Akonadi::Collection &collection);
+    static Type specialCollectionType(const Akonadi::Collection &collection);
 
     /**
      * Registers the given @p collection as a special mail collection
@@ -133,13 +133,13 @@
      * Returns whether the default resource has a special mail collection of
      * the given @p type.
      */
-    Q_REQUIRED_RESULT bool hasDefaultCollection(Type type) const;
+    bool hasDefaultCollection(Type type) const;
 
     /**
      * Returns the special mail collection of given @p type in the default
      * resource, or an invalid collection if such a collection is unknown.
      */
-    Q_REQUIRED_RESULT Akonadi::Collection defaultCollection(Type type) const;
+    Akonadi::Collection defaultCollection(Type type) const;
 
     void verifyI18nDefaultCollection(Type type);
 private Q_SLOTS:
diff -Nru akonadi-mime-19.04.3/src/specialmailcollectionsrequestjob.cpp akonadi-mime-17.12.3/src/specialmailcollectionsrequestjob.cpp
--- akonadi-mime-19.04.3/src/specialmailcollectionsrequestjob.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/specialmailcollectionsrequestjob.cpp	2018-02-26 05:43:21.000000000 +0000
@@ -31,21 +31,29 @@
     switch (type) {
     case SpecialMailCollections::Root:
         return "local-mail";
+        break;
     case SpecialMailCollections::Inbox:
         return "inbox";
+        break;
     case SpecialMailCollections::Outbox:
         return "outbox";
+        break;
     case SpecialMailCollections::SentMail:
         return "sent-mail";
+        break;
     case SpecialMailCollections::Trash:
         return "trash";
+        break;
     case SpecialMailCollections::Drafts:
         return "drafts";
+        break;
     case SpecialMailCollections::Templates:
         return "templates";
+        break;
     case SpecialMailCollections::LastType: // fallthrough
     default:
         return QByteArray();
+        break;
     }
 }
 
diff -Nru akonadi-mime-19.04.3/src/standardmailactionmanager.cpp akonadi-mime-17.12.3/src/standardmailactionmanager.cpp
--- akonadi-mime-19.04.3/src/standardmailactionmanager.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/standardmailactionmanager.cpp	2018-02-26 05:43:21.000000000 +0000
@@ -44,7 +44,7 @@
 #include <messagestatus.h>
 #include <kmime/kmime_message.h>
 
-#include <QAction>
+#include <qaction.h>
 #include <kactioncollection.h>
 
 #include <KLocalizedString>
diff -Nru akonadi-mime-19.04.3/src/standardmailactionmanager.h akonadi-mime-17.12.3/src/standardmailactionmanager.h
--- akonadi-mime-19.04.3/src/standardmailactionmanager.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-17.12.3/src/standardmailactionmanager.h	2018-02-26 05:43:21.000000000 +0000
@@ -174,13 +174,13 @@
      * Returns the list of collections that are currently selected.
      * The list is empty if no collection is currently selected.
      */
-    Q_REQUIRED_RESULT Akonadi::Collection::List selectedCollections() const;
+    Akonadi::Collection::List selectedCollections() const;
 
     /**
      * Returns the list of items that are currently selected.
      * The list is empty if no item is currently selected.
      */
-    Q_REQUIRED_RESULT Akonadi::Item::List selectedItems() const;
+    Akonadi::Item::List selectedItems() const;
 
     /**
      * Sets the favorite collections model based on which the collection