diff -Nru kmime-20.12.3/autotests/charfreqtest.cpp kmime-21.04.0/autotests/charfreqtest.cpp
--- kmime-20.12.3/autotests/charfreqtest.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/autotests/charfreqtest.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -7,7 +7,6 @@
 #include "charfreqtest.h"
 #include <QTest>
 
-#include <QDebug>
 
 #include <../src/kmime_charfreq.cpp>
 using namespace KMime;
diff -Nru kmime-20.12.3/autotests/dateformattertest.cpp kmime-21.04.0/autotests/dateformattertest.cpp
--- kmime-20.12.3/autotests/dateformattertest.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/autotests/dateformattertest.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -9,7 +9,6 @@
 #include <QTest>
 #include <QObject>
 #include <QDateTime>
-#include <QDebug>
 
 using namespace KMime;
 
diff -Nru kmime-20.12.3/autotests/headerfactorytest.cpp kmime-21.04.0/autotests/headerfactorytest.cpp
--- kmime-20.12.3/autotests/headerfactorytest.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/autotests/headerfactorytest.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -8,7 +8,6 @@
 
 //#include <typeinfo>
 
-#include <QDebug>
 #include <QTest>
 
 #include <kmime_headerfactory_p.h>
diff -Nru kmime-20.12.3/autotests/headertest.cpp kmime-21.04.0/autotests/headertest.cpp
--- kmime-20.12.3/autotests/headertest.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/autotests/headertest.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "headertest.h"
 
-#include <QDebug>
 #include <QTest>
 
 #include <kmime_headers.h>
diff -Nru kmime-20.12.3/autotests/typestest.cpp kmime-21.04.0/autotests/typestest.cpp
--- kmime-20.12.3/autotests/typestest.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/autotests/typestest.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -8,7 +8,6 @@
 
 #include <QTest>
 #include <QObject>
-#include <QDebug>
 
 using namespace KMime;
 
diff -Nru kmime-20.12.3/CMakeLists.txt kmime-21.04.0/CMakeLists.txt
--- kmime-20.12.3/CMakeLists.txt	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/CMakeLists.txt	2021-04-10 05:59:48.000000000 +0000
@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.5)
-set(PIM_VERSION "5.16.3")
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+set(PIM_VERSION "5.17.0")
 
 project(KMime VERSION ${PIM_VERSION})
 
 # ECM setup
-set(KF5_MIN_VERSION "5.75.0")
+set(KF5_MIN_VERSION "5.79.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
@@ -23,7 +23,7 @@
 
 
 set(KMIME_LIB_VERSION ${PIM_VERSION})
-set(QT_REQUIRED_VERSION "5.13.0")
+set(QT_REQUIRED_VERSION "5.14.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core)
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME
@@ -37,10 +37,19 @@
 find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
 add_definitions(-DTRANSLATION_DOMAIN=\"libkmime5\")
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE)
 
+set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false)
+if (USE_UNITY_CMAKE_SUPPORT)
+    if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
+        message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support")
+    else()
+        set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true)
+    endif()
+endif()
 ########### Targets ###########
 add_subdirectory(src)
 add_subdirectory(includes)
@@ -78,5 +87,5 @@
     COMPONENT Devel
     )
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 ki18n_install(po)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -Nru kmime-20.12.3/CMakePresets.json kmime-21.04.0/CMakePresets.json
--- kmime-20.12.3/CMakePresets.json	1970-01-01 00:00:00.000000000 +0000
+++ kmime-21.04.0/CMakePresets.json	2021-04-10 05:59:48.000000000 +0000
@@ -0,0 +1,56 @@
+{
+    "version": 1,
+    "configurePresets": [
+        {
+            "name": "dev",
+            "displayName": "Build as debug",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "asan",
+            "displayName": "Build with Asan support.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-asan",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "ECM_ENABLE_SANITIZERS" : "'address;undefined'",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "unity",
+            "displayName": "Build with CMake unity support.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-unity",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+		"USE_UNITY_CMAKE_SUPPORT": "ON",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "release",
+            "displayName": "Build as release mode.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-release",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "profile",
+            "displayName": "profile",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-profile",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        }
+    ]
+}
diff -Nru kmime-20.12.3/CMakePresets.json.license kmime-21.04.0/CMakePresets.json.license
--- kmime-20.12.3/CMakePresets.json.license	1970-01-01 00:00:00.000000000 +0000
+++ kmime-21.04.0/CMakePresets.json.license	2021-04-10 05:59:48.000000000 +0000
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021 Laurent Montel <montel@kde.org>
+# SPDX-License-Identifier: BSD-3-Clause
diff -Nru kmime-20.12.3/debian/changelog kmime-21.04.0/debian/changelog
--- kmime-20.12.3/debian/changelog	2021-03-04 15:22:39.000000000 +0000
+++ kmime-21.04.0/debian/changelog	2021-04-29 00:38:56.000000000 +0000
@@ -1,3 +1,10 @@
+kmime (21.04.0-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (21.04.0)
+  * Update enable_debian_abi_manager.diff
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 29 Apr 2021 01:38:56 +0100
+
 kmime (20.12.3-0ubuntu1) hirsute; urgency=medium
 
   * New upstream release (20.12.3)
diff -Nru kmime-20.12.3/debian/patches/enable_debian_abi_manager.diff kmime-21.04.0/debian/patches/enable_debian_abi_manager.diff
--- kmime-20.12.3/debian/patches/enable_debian_abi_manager.diff	2021-03-04 15:22:39.000000000 +0000
+++ kmime-21.04.0/debian/patches/enable_debian_abi_manager.diff	2021-04-29 00:38:56.000000000 +0000
@@ -1,8 +1,8 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -77,3 +77,5 @@
+@@ -89,3 +89,5 @@
  
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
  ki18n_install(po)
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 +
 +include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff -Nru kmime-20.12.3/.gitignore kmime-21.04.0/.gitignore
--- kmime-20.12.3/.gitignore	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/.gitignore	2021-04-10 05:59:48.000000000 +0000
@@ -18,3 +18,4 @@
 .cmake/
 CMakeLists.txt.user*
 *.unc-backup*
+compile_commands.json
diff -Nru kmime-20.12.3/.gitlab-ci.yml kmime-21.04.0/.gitlab-ci.yml
--- kmime-20.12.3/.gitlab-ci.yml	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/.gitlab-ci.yml	2021-04-10 05:59:48.000000000 +0000
@@ -1,10 +1,14 @@
+# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <montel@kde.org>
+# SPDX-FileCopyrightText: 2021 Laurent Montel <montel@kde.org>
+# SPDX-License-Identifier: CC0-1.0
+
 include:
   - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
   - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
 
 build_clazy_clang_tidy:
   stage: build
-  image: kdeorg/ci-suse-qt514
+  image: kdeorg/ci-suse-qt515
   extends: .linux
   #only:
   #  - merge_requests
@@ -26,5 +30,5 @@
     - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX
     - cd build && run-clang-tidy
   variables:
-    PLATFORM: SUSEQt5.14
+    PLATFORM: SUSEQt5.15
     BRANCH_GROUP: kf5-qt5
diff -Nru kmime-20.12.3/LICENSES/CC0-1.0.txt kmime-21.04.0/LICENSES/CC0-1.0.txt
--- kmime-20.12.3/LICENSES/CC0-1.0.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmime-21.04.0/LICENSES/CC0-1.0.txt	2021-04-10 05:59:48.000000000 +0000
@@ -0,0 +1,119 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
+NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
+AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
+ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
+OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
+LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
+OR WORKS PROVIDED HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive
+Copyright and Related Rights (defined below) upon the creator and subsequent
+owner(s) (each and all, an "owner") of an original work of authorship and/or
+a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later claims
+of infringement build upon, modify, incorporate in other works, reuse and
+redistribute as freely as possible in any form whatsoever and for any purposes,
+including without limitation commercial purposes. These owners may contribute
+to the Commons to promote the ideal of a free culture and the further production
+of creative, cultural and scientific works, or to gain reputation or greater
+distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with
+a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or
+her Copyright and Related Rights in the Work and the meaning and intended
+legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected
+by copyright and related or neighboring rights ("Copyright and Related Rights").
+Copyright and Related Rights include, but are not limited to, the following:
+
+i. the right to reproduce, adapt, distribute, perform, display, communicate,
+and translate a Work;
+
+      ii. moral rights retained by the original author(s) and/or performer(s);
+
+iii. publicity and privacy rights pertaining to a person's image or likeness
+depicted in a Work;
+
+iv. rights protecting against unfair competition in regards to a Work, subject
+to the limitations in paragraph 4(a), below;
+
+v. rights protecting the extraction, dissemination, use and reuse of data
+in a Work;
+
+vi. database rights (such as those arising under Directive 96/9/EC of the
+European Parliament and of the Council of 11 March 1996 on the legal protection
+of databases, and under any national implementation thereof, including any
+amended or successor version of such directive); and
+
+vii. other similar, equivalent or corresponding rights throughout the world
+based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time extensions),
+(iii) in any current or future medium and for any number of copies, and (iv)
+for any purpose whatsoever, including without limitation commercial, advertising
+or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
+benefit of each member of the public at large and to the detriment of Affirmer's
+heirs and successors, fully intending that such Waiver shall not be subject
+to revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account Affirmer's
+express Statement of Purpose. In addition, to the extent the Waiver is so
+judged Affirmer hereby grants to each affected person a royalty-free, non
+transferable, non sublicensable, non exclusive, irrevocable and unconditional
+license to exercise Affirmer's Copyright and Related Rights in the Work (i)
+in all territories worldwide, (ii) for the maximum duration provided by applicable
+law or treaty (including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional purposes
+(the "License"). The License shall be deemed effective as of the date CC0
+was applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder of
+the License, and in such case Affirmer hereby affirms that he or she will
+not (i) exercise any of his or her remaining Copyright and Related Rights
+in the Work or (ii) assert any associated claims and causes of action with
+respect to the Work, in either case contrary to Affirmer's express Statement
+of Purpose.
+
+   4. Limitations and Disclaimers.
+
+a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
+licensed or otherwise affected by this document.
+
+b. Affirmer offers the Work as-is and makes no representations or warranties
+of any kind concerning the Work, express, implied, statutory or otherwise,
+including without limitation warranties of title, merchantability, fitness
+for a particular purpose, non infringement, or the absence of latent or other
+defects, accuracy, or the present or absence of errors, whether or not discoverable,
+all to the greatest extent permissible under applicable law.
+
+c. Affirmer disclaims responsibility for clearing rights of other persons
+that may apply to the Work or any use thereof, including without limitation
+any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
+responsibility for obtaining any necessary consents, permissions or other
+rights required for any use of the Work.
+
+d. Affirmer understands and acknowledges that Creative Commons is not a party
+to this document and has no duty or obligation with respect to this CC0 or
+use of the Work.
diff -Nru kmime-20.12.3/po/ar/libkmime5.po kmime-21.04.0/po/ar/libkmime5.po
--- kmime-20.12.3/po/ar/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/ar/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2018-02-01 00:08+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -18,24 +18,24 @@
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "مجهول"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "اليوم %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "الأمس %1"
 
 # الإثنين   5 يناير 2015
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/bg/libkmime5.po kmime-21.04.0/po/bg/libkmime5.po
--- kmime-20.12.3/po/bg/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/bg/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2009-08-28 11:45+0300\n"
 "Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -18,23 +18,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "неизвестно"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "днес %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "вчера %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/bs/libkmime5.po kmime-21.04.0/po/bs/libkmime5.po
--- kmime-20.12.3/po/bs/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/bs/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kdepimlibs\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2012-09-03 13:39+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -20,23 +20,23 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Danas %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Juče %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ca/libkmime5.po kmime-21.04.0/po/ca/libkmime5.po
--- kmime-20.12.3/po/ca/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/ca/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-11-18 20:55+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -23,23 +23,23 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Accelerator-Marker: &\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "desconegut"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Avui %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ahir %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ca@valencia/libkmime5.po kmime-21.04.0/po/ca@valencia/libkmime5.po
--- kmime-20.12.3/po/ca@valencia/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/ca@valencia/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-11-18 20:55+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -23,23 +23,23 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Accelerator-Marker: &\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "desconegut"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Hui %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ahir %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/cs/libkmime5.po kmime-21.04.0/po/cs/libkmime5.po
--- kmime-20.12.3/po/cs/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/cs/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-10-21 14:02+0200\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -17,23 +17,23 @@
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "neznámý"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Dnes %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Včera %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/da/libkmime5.po kmime-21.04.0/po/da/libkmime5.po
--- kmime-20.12.3/po/da/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/da/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-03-30 12:57+0200\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,23 +17,23 @@
 "X-Generator: LoKalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ukendt"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "I dag %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "I går %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/de/libkmime5.po kmime-21.04.0/po/de/libkmime5.po
--- kmime-20.12.3/po/de/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/de/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-05-10 12:07+0200\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -14,23 +14,23 @@
 "X-Generator: LoKalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Heute %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Gestern %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/el/libkmime5.po kmime-21.04.0/po/el/libkmime5.po
--- kmime-20.12.3/po/el/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/el/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-02-22 21:02+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -18,23 +18,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "άγνωστος"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Σήμερα %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Χθες %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/en_GB/libkmime5.po kmime-21.04.0/po/en_GB/libkmime5.po
--- kmime-20.12.3/po/en_GB/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/en_GB/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-08-17 13:15+0100\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-l10n-en_gb@kde.org>\n"
@@ -17,23 +17,23 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "unknown"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Today %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Yesterday %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/eo/libkmime5.po kmime-21.04.0/po/eo/libkmime5.po
--- kmime-20.12.3/po/eo/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/eo/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2009-11-15 12:06+0100\n"
 "Last-Translator: Axel Rousseau <axel@esperanto-jeunes.org>\n"
 "Language-Team: esperanto <kde-i18n-eo@kde.org>\n"
@@ -16,23 +16,23 @@
 "X-Generator: pology\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr ""
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr ""
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr ""
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/es/libkmime5.po kmime-21.04.0/po/es/libkmime5.po
--- kmime-20.12.3/po/es/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/es/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2016-01-07 13:45+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <l10n-kde-es@kde.org>\n"
@@ -21,23 +21,23 @@
 "X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "desconocido"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Hoy %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ayer %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/et/libkmime5.po kmime-21.04.0/po/et/libkmime5.po
--- kmime-20.12.3/po/et/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/et/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-06-03 21:20+0200\n"
 "Last-Translator: Marek Laane <bald@smail.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -16,23 +16,23 @@
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "tundmatu"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Täna %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Eile %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/eu/libkmime5.po kmime-21.04.0/po/eu/libkmime5.po
--- kmime-20.12.3/po/eu/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/eu/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2020-07-31 20:17+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@ni.eus>\n"
 "Language-Team: Basque <kde-i18n-eu@kde.org>\n"
@@ -22,23 +22,23 @@
 "X-Generator: Lokalize 20.04.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Gaur %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Atzo %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/fa/libkmime5.po kmime-21.04.0/po/fa/libkmime5.po
--- kmime-20.12.3/po/fa/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/fa/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2007-01-01 11:35+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -18,23 +18,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, fuzzy, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ناشناخته"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "امروز %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "دیروز %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/fi/libkmime5.po kmime-21.04.0/po/fi/libkmime5.po
--- kmime-20.12.3/po/fi/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/fi/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2016-02-15 00:07+0200\n"
 "Last-Translator: Lasse Liehu <lasse.liehu@gmail.com>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -20,23 +20,23 @@
 "X-POT-Import-Date: 2012-12-01 22:25:20+0000\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Tänään %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Eilen %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/fr/libkmime5.po kmime-21.04.0/po/fr/libkmime5.po
--- kmime-20.12.3/po/fr/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/fr/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2013-06-06 14:27+0200\n"
 "Last-Translator: xavier <xavier.besnard@neuf.fr>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
@@ -22,23 +22,23 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "inconnu"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Aujourd'hui %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Hier %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ga/libkmime5.po kmime-21.04.0/po/ga/libkmime5.po
--- kmime-20.12.3/po/ga/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/ga/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kdepim/libkmime.po\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -17,23 +17,23 @@
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? "
 "3 : 4\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "anaithnid"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Inniu %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Inné %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/gl/libkmime5.po kmime-21.04.0/po/gl/libkmime5.po
--- kmime-20.12.3/po/gl/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/gl/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2018-04-30 00:14+0100\n"
 "Last-Translator: Adrian Chaves <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -17,23 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "descoñecido"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Hoxe %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Onte %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/hi/libkmime5.po kmime-21.04.0/po/hi/libkmime5.po
--- kmime-20.12.3/po/hi/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/hi/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2020-08-20 01:51+0530\n"
 "Last-Translator: G Karunakar <karunakar@indlinux.org>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
@@ -19,23 +19,23 @@
 "X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "अज्ञात"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "आज %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "कल %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/hu/libkmime5.po kmime-21.04.0/po/hu/libkmime5.po
--- kmime-20.12.3/po/hu/libkmime5.po	2021-03-02 00:51:25.000000000 +0000
+++ kmime-21.04.0/po/hu/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: KDE 4.1\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-05-26 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -14,23 +14,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Ma - %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Tegnap - %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ia/libkmime5.po kmime-21.04.0/po/ia/libkmime5.po
--- kmime-20.12.3/po/ia/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/ia/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2012-07-24 14:18+0200\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
@@ -17,23 +17,23 @@
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "incognite"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Hodie %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Heri %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/it/libkmime5.po kmime-21.04.0/po/it/libkmime5.po
--- kmime-20.12.3/po/it/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/it/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-07-19 00:09+0200\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -15,23 +15,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Oggi %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ieri %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ja/libkmime5.po kmime-21.04.0/po/ja/libkmime5.po
--- kmime-20.12.3/po/ja/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/ja/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-03-01 07:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -20,23 +20,23 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "不明"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "今日 %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "昨日 %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/kk/libkmime5.po kmime-21.04.0/po/kk/libkmime5.po
--- kmime-20.12.3/po/kk/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/kk/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2012-03-01 05:24+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -17,23 +17,23 @@
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "беймәлім"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Бүгін %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Кеше %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/km/libkmime5.po kmime-21.04.0/po/km/libkmime5.po
--- kmime-20.12.3/po/km/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/km/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2010-06-24 15:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -17,23 +17,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "មិន​ស្គាល់"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "ថ្ងៃនេះ %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "ម្សិលមិញ %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ko/libkmime5.po kmime-21.04.0/po/ko/libkmime5.po
--- kmime-20.12.3/po/ko/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/ko/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-03-03 00:28+0900\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -17,23 +17,23 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "알 수 없음"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "오늘 %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "어제 %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/lt/libkmime5.po kmime-21.04.0/po/lt/libkmime5.po
--- kmime-20.12.3/po/lt/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/lt/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2009-03-07 16:19+0300\n"
 "Last-Translator: Andrius Štikonas <andrius@stikonas.eu>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -16,23 +16,23 @@
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
 "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "nežinoma"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Šiandien %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Vakar %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/lv/libkmime5.po kmime-21.04.0/po/lv/libkmime5.po
--- kmime-20.12.3/po/lv/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/lv/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-06-18 08:24+0300\n"
 "Last-Translator: Viesturs Zarins <viesturs.zarins@mii.lu.lv>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
@@ -20,23 +20,23 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "nezināms"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Šodien %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Vakar %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/mr/libkmime5.po kmime-21.04.0/po/mr/libkmime5.po
--- kmime-20.12.3/po/mr/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/mr/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2013-03-16 11:56+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -17,23 +17,23 @@
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "अपरिचीत"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "आज %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "काल %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/nb/libkmime5.po kmime-21.04.0/po/nb/libkmime5.po
--- kmime-20.12.3/po/nb/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/nb/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-09-17 15:12+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <l10n-no@lister.huftis.org>\n"
@@ -20,23 +20,23 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ukjent"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "I dag %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "I går %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/nds/libkmime5.po kmime-21.04.0/po/nds/libkmime5.po
--- kmime-20.12.3/po/nds/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/nds/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-06-01 16:37+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -17,23 +17,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "nich begäng"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Vundaag, %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Güstern, %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/nl/libkmime5.po kmime-21.04.0/po/nl/libkmime5.po
--- kmime-20.12.3/po/nl/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/nl/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2012-03-08 07:56+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -19,23 +19,23 @@
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "onbekend"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "vandaag %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "gisteren %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/nn/libkmime5.po kmime-21.04.0/po/nn/libkmime5.po
--- kmime-20.12.3/po/nn/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/nn/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2020-07-07 21:50+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
@@ -20,23 +20,23 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ukjend"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "I dag, kl. %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "I går, kl. %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/pa/libkmime5.po kmime-21.04.0/po/pa/libkmime5.po
--- kmime-20.12.3/po/pa/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/pa/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2009-01-20 09:03+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@users.sf.net>\n"
@@ -17,23 +17,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "ਅੱਜ %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "ਕੱਲ੍ਹ %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/pl/libkmime5.po kmime-21.04.0/po/pl/libkmime5.po
--- kmime-20.12.3/po/pl/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/pl/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-08-16 08:03+0200\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -18,23 +18,23 @@
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "nieznany"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Dzisiaj %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Wczoraj %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/pt/libkmime5.po kmime-21.04.0/po/pt/libkmime5.po
--- kmime-20.12.3/po/pt/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/pt/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-02-20 21:24+0000\n"
 "Last-Translator: José Nuno Pires <zepires@gmail.com>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -13,23 +13,23 @@
 "X-POFile-SpellExtra: subject Failure \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "desconhecida"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Hoje %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ontem %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/pt_BR/libkmime5.po kmime-21.04.0/po/pt_BR/libkmime5.po
--- kmime-20.12.3/po/pt_BR/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/pt_BR/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-08-16 10:56-0300\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -18,23 +18,23 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Hoje %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ontem %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ro/libkmime5.po kmime-21.04.0/po/ro/libkmime5.po
--- kmime-20.12.3/po/ro/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/ro/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2009-01-14 11:49+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@lists.kde.org>\n"
@@ -19,23 +19,23 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "necunoscut"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Astăzi %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ieri %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ru/libkmime5.po kmime-21.04.0/po/ru/libkmime5.po
--- kmime-20.12.3/po/ru/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/ru/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2010-12-04 22:33+0300\n"
 "Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -23,23 +23,23 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "неизвестное"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Сегодня %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Вчера %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/sk/libkmime5.po kmime-21.04.0/po/sk/libkmime5.po
--- kmime-20.12.3/po/sk/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/sk/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: libkmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-08-14 14:19+0200\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
@@ -15,23 +15,23 @@
 "X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "unknown"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Dnes %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Včera %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/sl/libkmime5.po kmime-21.04.0/po/sl/libkmime5.po
--- kmime-20.12.3/po/sl/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/sl/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-08-29 16:54+0200\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -20,23 +20,23 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "neznan"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Danes %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Včeraj %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/sv/libkmime5.po kmime-21.04.0/po/sv/libkmime5.po
--- kmime-20.12.3/po/sv/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/sv/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-04-19 12:22+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,23 +17,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "okänd"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "I dag %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "I går %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/tr/libkmime5.po kmime-21.04.0/po/tr/libkmime5.po
--- kmime-20.12.3/po/tr/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/tr/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kdepimlibs-kde4\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2014-11-12 01:06+0200\n"
 "Last-Translator: Kaan Ozdincer <kaanozdincer@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
@@ -23,23 +23,23 @@
 "X-Generator: Lokalize 1.4\n"
 "(http: //www.transifex.com/projects/p/kdepimlibs-k-tr/language/tr/)\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Bugün %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Dün %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/ug/libkmime5.po kmime-21.04.0/po/ug/libkmime5.po
--- kmime-20.12.3/po/ug/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/ug/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+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"
@@ -17,23 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "نامەلۇم"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr ""
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "تۈنۈگۈن %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/uk/libkmime5.po kmime-21.04.0/po/uk/libkmime5.po
--- kmime-20.12.3/po/uk/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/uk/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -1,5 +1,5 @@
 # Translation of libkmime5.po to Ukrainian
-# Copyright (C) 2014 This_file_is_part_of_KDE
+# Copyright (C) 2018 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.
 #
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libkmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2009-06-20 19:02+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -21,23 +21,23 @@
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "невідомий"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Сьогодні %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Вчора %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/wa/libkmime5.po kmime-21.04.0/po/wa/libkmime5.po
--- kmime-20.12.3/po/wa/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/wa/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-12-26 15:45+0100\n"
 "Last-Translator: Jean Cayron <jean.cayron@gmail.com>\n"
 "Language-Team: Walloon <linux@walon.org>\n"
@@ -17,23 +17,23 @@
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "nén cnoxhou"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "Ouy %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "Ayir %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/zh_CN/libkmime5.po kmime-21.04.0/po/zh_CN/libkmime5.po
--- kmime-20.12.3/po/zh_CN/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/zh_CN/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
-"PO-Revision-Date: 2021-02-04 12:00\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
+"PO-Revision-Date: 2021-03-27 17:31\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -21,23 +21,23 @@
 "X-Crowdin-File: /kf5-stable/messages/kmime/libkmime5.pot\n"
 "X-Crowdin-File-ID: 3205\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "未知"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "今天 %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "昨天 %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/po/zh_TW/libkmime5.po kmime-21.04.0/po/zh_TW/libkmime5.po
--- kmime-20.12.3/po/zh_TW/libkmime5.po	2021-03-02 00:51:26.000000000 +0000
+++ kmime-21.04.0/po/zh_TW/libkmime5.po	2021-04-16 08:45:33.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libkmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2020-09-11 02:26+0200\n"
+"POT-Creation-Date: 2021-01-19 02:42+0100\n"
 "PO-Revision-Date: 2008-02-20 13:14+0800\n"
 "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@lists.linux.org.tw>\n"
@@ -17,23 +17,23 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: kmime_dateformatter.cpp:254
+#: kmime_dateformatter.cpp:250
 #, kde-format
 msgctxt "invalid time specified"
 msgid "unknown"
 msgstr "未知"
 
-#: kmime_dateformatter.cpp:270
+#: kmime_dateformatter.cpp:266
 #, kde-format
 msgid "Today %1"
 msgstr "今天 %1"
 
-#: kmime_dateformatter.cpp:274
+#: kmime_dateformatter.cpp:270
 #, kde-format
 msgid "Yesterday %1"
 msgstr "昨天 %1"
 
-#: kmime_dateformatter.cpp:279
+#: kmime_dateformatter.cpp:275
 #, kde-format
 msgctxt "1. weekday, 2. time"
 msgid "%1 %2"
diff -Nru kmime-20.12.3/sanitizers.supp kmime-21.04.0/sanitizers.supp
--- kmime-20.12.3/sanitizers.supp	1970-01-01 00:00:00.000000000 +0000
+++ kmime-21.04.0/sanitizers.supp	2021-04-10 05:59:48.000000000 +0000
@@ -0,0 +1,14 @@
+# Suppression file for ASAN/LSAN
+
+leak:libspeechd
+leak:getdelim
+leak:g_malloc
+leak:libfontconfig
+leak:libdbus
+leak:QEasingCurve::
+leak:QtSharedPointer::ExternalRefCountData::getAndRef
+leak:QArrayData::allocate
+leak:QObject::QObject
+leak:QObjectPrivate::addConnection
+leak:QObjectPrivate::connectImpl
+leak:QPropertyAnimation::QPropertyAnimation
diff -Nru kmime-20.12.3/src/CMakeLists.txt kmime-21.04.0/src/CMakeLists.txt
--- kmime-20.12.3/src/CMakeLists.txt	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/CMakeLists.txt	2021-04-10 05:59:48.000000000 +0000
@@ -32,7 +32,9 @@
         DESCRIPTION "kmime (pim lib)" EXPORT KMIME)
 
 add_library(KF5Mime ${kmime_LIB_SRCS})
-
+if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+    set_target_properties(KF5Mime PROPERTIES UNITY_BUILD ON)
+endif()
 generate_export_header(KF5Mime BASE_NAME KMime)
 
 add_library(KF5::Mime ALIAS KF5Mime)
diff -Nru kmime-20.12.3/src/kmime_codecs.cpp kmime-21.04.0/src/kmime_codecs.cpp
--- kmime-20.12.3/src/kmime_codecs.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_codecs.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -12,7 +12,6 @@
 #include "kmime_debug.h"
 #include <KCharsets>
 
-#include <QDebug>
 #include <QTextCodec>
 
 namespace KMime {
diff -Nru kmime-20.12.3/src/kmime_content.cpp kmime-21.04.0/src/kmime_content.cpp
--- kmime-20.12.3/src/kmime_content.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_content.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -31,7 +31,6 @@
 #include <KCharsets>
 #include <KCodecs/KCodecs>
 
-#include <KLocalizedString>
 
 #include <QTextCodec>
 
@@ -188,7 +187,8 @@
     }
 
     d->head = assembleHeaders();
-    foreach (Content *c, contents()) {
+    const auto contentsList = contents();
+    for (Content *c : contentsList) {
         c->assemble();
     }
 }
@@ -425,7 +425,8 @@
     if (contentType()->isText()) {
         ret = this;
     } else {
-        foreach (Content *c, d_ptr->contents()) {
+        const auto contents = d_ptr->contents();
+        for (Content *c : contents) {
             if ((ret = c->textContent()) != nullptr) {
                 break;
             }
@@ -558,7 +559,8 @@
 
         // Move all headers from the old subcontent to ourselves.
         // NOTE: This also sets the new Content-Type.
-        foreach (Headers::Base *h, main->d_ptr->headers) {
+        const auto headers = main->d_ptr->headers;
+        for (Headers::Base *h : headers) {
             setHeader(h);   // Will remove the old one if present.
         }
         main->d_ptr->headers.clear();
@@ -693,7 +695,8 @@
 
         // FIXME: This should take into account the boundary headers that are added in
         //        encodedContent!
-        foreach (Content *c, d->contents()) {
+        const auto contents = d->contents();
+        for (Content *c : contents) {
             s += c->storageSize();
         }
     }
@@ -710,7 +713,8 @@
     }
     ret += d->body.count('\n');
 
-    foreach (Content *c, d->contents()) {
+    const auto contents = d->contents();
+    for (Content *c : contents) {
         ret += c->lineCount();
     }
 
diff -Nru kmime-20.12.3/src/kmime_dateformatter.cpp kmime-21.04.0/src/kmime_dateformatter.cpp
--- kmime-20.12.3/src/kmime_dateformatter.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_dateformatter.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -235,11 +235,7 @@
     QTextStream s(&ret, QIODevice::WriteOnly);
     s << (neg ? '-' : '+')         
       << qSetFieldWidth(2) << qSetPadChar(QLatin1Char('0'))
-     #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-      << right
-     #else
       << Qt::right
-     #endif
       << hours << mins;
     //old code: ret.sprintf( "%c%.2d%.2d", (neg) ? '-' : '+', hours, mins );
 
diff -Nru kmime-20.12.3/src/kmime_header_parsing.cpp kmime-21.04.0/src/kmime_header_parsing.cpp
--- kmime-20.12.3/src/kmime_header_parsing.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_header_parsing.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -25,7 +25,6 @@
 #include <QTextCodec>
 #include <QMap>
 #include <QStringList>
-#include <QUrl>
 
 #include <ctype.h> // for isdigit
 #include <cassert>
@@ -1458,11 +1457,7 @@
     if (!dec->decode(decCursor, decEnd, bit, bend)) {
         KMIME_WARN << rfc2231Codec->name()
                    << "codec lies about its maxDecodedSizeFor()"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                   << endl
-              #else
                    << Qt::endl
-              #endif
                    << "result may be truncated";
     }
 
diff -Nru kmime-20.12.3/src/kmime_header_parsing.h kmime-21.04.0/src/kmime_header_parsing.h
--- kmime-20.12.3/src/kmime_header_parsing.h	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_header_parsing.h	2021-04-10 05:59:48.000000000 +0000
@@ -15,13 +15,11 @@
 
 #include <QString>
 #include <QPair>
-#include <QVector>
-#include <QFlags>
 
 #include <QDateTime>
 
 template <typename K, typename V> class QMap;
-class QStringList;
+#include <QStringList>
 
 namespace KMime
 {
diff -Nru kmime-20.12.3/src/kmime_headers.cpp kmime-21.04.0/src/kmime_headers.cpp
--- kmime-20.12.3/src/kmime_headers.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_headers.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -38,7 +38,6 @@
 #include <KCharsets>
 #include <KCodecs>
 
-#include <QTextCodec>
 
 #include <assert.h>
 #include <ctype.h>
@@ -364,7 +363,8 @@
 {
     QVector<QByteArray> rv;
     rv.reserve(d_func()->mailboxList.count());
-    foreach (const Types::Mailbox &mbox, d_func()->mailboxList) {
+    const auto mailboxList = d_func()->mailboxList;
+    for (const Types::Mailbox &mbox : mailboxList) {
         rv.append(mbox.address());
     }
     return rv;
@@ -424,11 +424,7 @@
         if (!(it).displayName.isEmpty()) {
             KMIME_WARN << "mailbox groups in header disallowing them! Name: \""
                        << (it).displayName << "\""
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                       << endl
-              #else
                        << Qt::endl
-              #endif
                           ;
         }
         d->mailboxList += (it).mailboxList;
@@ -454,12 +450,7 @@
 
     if (d->mailboxList.count() > 1) {
         KMIME_WARN << "multiple mailboxes in header allowing only a single one!"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                   << endl
-              #else
-                   << Qt::endl
-              #endif
-                      ;
+                   << Qt::endl;
     }
     return true;
 }
@@ -508,7 +499,8 @@
     QStringList rv;
     for (const Types::Address &addr : qAsConst(d->addressList)) {
         rv.reserve(rv.size() + addr.mailboxList.size());
-        foreach (const Types::Mailbox &mbox, addr.mailboxList) {
+        const auto mailboxList = addr.mailboxList;
+        for (const Types::Mailbox &mbox : mailboxList) {
             rv.append(mbox.prettyAddress());
         }
     }
@@ -549,8 +541,10 @@
 QVector<QByteArray> AddressList::addresses() const
 {
     QVector<QByteArray> rv;
-    foreach (const Types::Address &addr, d_func()->addressList) {
-        foreach (const Types::Mailbox &mbox, addr.mailboxList) {
+    const auto addressList = d_func()->addressList;
+    for (const Types::Address &addr : addressList) {
+        const auto mailboxList = addr.mailboxList;
+        for (const Types::Mailbox &mbox : mailboxList) {
             rv.append(mbox.address());
         }
     }
@@ -582,8 +576,10 @@
 Types::Mailbox::List AddressList::mailboxes() const
 {
     Types::Mailbox::List rv;
-    foreach (const Types::Address &addr, d_func()->addressList) {
-        foreach (const Types::Mailbox &mbox, addr.mailboxList) {
+    const auto addressList = d_func()->addressList;
+    for (const Types::Address &addr : addressList) {
+        const auto mailboxList = addr.mailboxList;
+        for (const Types::Mailbox &mbox : mailboxList) {
             rv.append(mbox);
         }
     }
@@ -666,12 +662,7 @@
     if (scursor != send) {
         KMIME_WARN << "trailing garbage after token in header allowing "
                    "only a single token!"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                   << endl
-              #else
-                   << Qt::endl
-              #endif
-                      ;
+                   << Qt::endl;
     }
     return true;
 }
@@ -819,12 +810,7 @@
     if (scursor != send) {
         KMIME_WARN << "trailing garbage after dot-atom in header allowing "
                    "only a single dot-atom!"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                   << endl
-              #else
-                   << Qt::endl
-              #endif
-                      ;
+                   << Qt::endl;
     }
     return true;
 }
@@ -1013,7 +999,8 @@
 QVector<QByteArray> Ident::identifiers() const
 {
     QVector<QByteArray> rv;
-    foreach (const Types::AddrSpec &addr, d_func()->msgIdList) {
+    const auto msgIdList = d_func()->msgIdList;
+    for (const Types::AddrSpec &addr : msgIdList) {
         if (!addr.isEmpty()) {
             const QString asString = addr.asString();
             if (!asString.isEmpty()) {
@@ -1097,12 +1084,7 @@
     if (d->msgIdList.count() > 1) {
         KMIME_WARN << "more than one msg-id in header "
                    << "allowing only a single one!"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                   << endl
-              #else
-                   << Qt::endl
-              #endif
-                      ;
+                   << Qt::endl;
     }
     return true;
 }
@@ -1177,13 +1159,7 @@
         // check that there was no display-name:
         if (maybeMailbox.hasName()) {
             KMIME_WARN << "display-name \"" << maybeMailbox.name()
-                       << "\" in Return-Path!"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                       << endl
-              #else
-                       << Qt::endl
-              #endif
-                          ;
+                       << "\" in Return-Path!" << Qt::endl;
         }
     }
     d->mailbox = maybeMailbox;
@@ -1193,12 +1169,7 @@
     // and warn if it wasn't:
     if (scursor != send) {
         KMIME_WARN << "trailing garbage after angle-addr in Return-Path!"
-              #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-                   << endl
-              #else
-                   << Qt::endl
-              #endif
-                      ;
+                   << Qt::endl;
     }
     return true;
 }
@@ -1536,7 +1507,7 @@
 }
 
 void Newsgroups::fromUnicodeString(const QString & s, const QByteArray & b) {
-    Q_UNUSED(b);
+    Q_UNUSED(b)
     Q_D(Newsgroups);
     from7BitString(s.toUtf8());
     d->encCS = cachedCharset("UTF-8");
@@ -1571,24 +1542,21 @@
 bool Newsgroups::parse(const char *&scursor, const char *const send, bool isCRLF) {
     Q_D(Newsgroups);
     clear();
-    forever {
-    eatCFWS(scursor, send, isCRLF);
-        if (scursor != send && *scursor == ',')
-        {
-            ++scursor;
-        }
-        eatCFWS(scursor, send, isCRLF);
-        if (scursor == send)
-        {
-            return true;
-        }
-        const char *start = scursor;
-        while (scursor != send && !isspace(*scursor) && *scursor != ',')
-        {
-            ++scursor;
-        }
-        QByteArray group(start, scursor - start);
-        d->groups.append(group);
+    while (true) {
+      eatCFWS(scursor, send, isCRLF);
+      if (scursor != send && *scursor == ',') {
+        ++scursor;
+      }
+      eatCFWS(scursor, send, isCRLF);
+      if (scursor == send) {
+        return true;
+      }
+      const char *start = scursor;
+      while (scursor != send && !isspace(*scursor) && *scursor != ',') {
+        ++scursor;
+      }
+      QByteArray group(start, scursor - start);
+      d->groups.append(group);
     }
     return true;
 }
diff -Nru kmime-20.12.3/src/kmime_headers.h kmime-21.04.0/src/kmime_headers.h
--- kmime-20.12.3/src/kmime_headers.h	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_headers.h	2021-04-10 05:59:48.000000000 +0000
@@ -33,7 +33,6 @@
 #include <QString>
 #include <QStringList>
 #include <QDateTime>
-#include <QMap>
 #include <QVector>
 #include <QByteArray>
 #include <QMetaType>
@@ -82,7 +81,7 @@
 #define kmime_mk_trivial_ctor( subclass )                               \
     public:                                                               \
     subclass();                           \
-    ~subclass();
+    ~subclass() override;
 
 #define kmime_mk_dptr_ctor( subclass ) \
     protected: \
@@ -232,7 +231,7 @@
     //@endcond
 public:
     Unstructured();
-    ~Unstructured();
+    ~Unstructured() override;
 
     using Base::from7BitString;
     void from7BitString(const QByteArray &s) override;
@@ -285,7 +284,7 @@
 {
 public:
     Structured();
-    ~Structured();
+    ~Structured() override;
 
     void from7BitString(const char *s, size_t len) override;
     void from7BitString(const QByteArray &s) override;
@@ -321,7 +320,7 @@
 {
 public:
     Address();
-    ~Address();
+    ~Address() override;
 protected:
     //@cond PRIVATE
     kmime_mk_dptr_ctor(Address)
@@ -1198,7 +1197,7 @@
 public:
     Generic();
     Generic(const char *t, int len = -1);
-    ~Generic();
+    ~Generic() override;
 
     void clear() override;
 
diff -Nru kmime-20.12.3/src/kmime_headers_p.h kmime-21.04.0/src/kmime_headers_p.h
--- kmime-20.12.3/src/kmime_headers_p.h	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_headers_p.h	2021-04-10 05:59:48.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef KMIME_HEADERS_P_H
 #define KMIME_HEADERS_P_H
 
+#include <QMap>
 //@cond PRIVATE
 
 #define kmime_mk_empty_private( subclass, base ) \
diff -Nru kmime-20.12.3/src/kmime_util.cpp kmime-21.04.0/src/kmime_util.cpp
--- kmime-20.12.3/src/kmime_util.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/src/kmime_util.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -20,11 +20,9 @@
 #include <config-kmime.h>
 // #include <kdefakes.h> // for strcasestr
 
-#include <KLocalizedString>
 #include <KCharsets>
 #include <QCoreApplication>
 
-#include <QTextCodec>
 
 #include <ctype.h>
 #include <time.h>
diff -Nru kmime-20.12.3/tests/test_kmime_header_parsing.cpp kmime-21.04.0/tests/test_kmime_header_parsing.cpp
--- kmime-20.12.3/tests/test_kmime_header_parsing.cpp	2021-02-04 12:58:26.000000000 +0000
+++ kmime-21.04.0/tests/test_kmime_header_parsing.cpp	2021-04-10 05:59:48.000000000 +0000
@@ -4,10 +4,7 @@
 
 #include <QFile>
 #include <QByteArray>
-#include <QVector>
-//#include <QString>
-
-//#include <stdio.h>
+#include <QMap>
 #include <iostream>
 #include <cstdlib>
 #include <cassert>
@@ -122,7 +119,7 @@
     }
 
     assert(action == Token);
-    Q_UNUSED(action); // avoid warning in release mode
+    Q_UNUSED(action) // avoid warning in release mode
 
     int index;
     for (index = 0 ; index < tokenTypesLen ; ++index) {
@@ -347,7 +344,8 @@
              << "result.displayName:\n"
              << endl;
         int i = 0;
-        foreach (const auto &it, result.mailboxList) {
+        const auto mailboxList = result.mailboxList;
+        for (const auto &it : mailboxList) {
             cout << "result.mailboxList[" << i << "].displayName:\n"
                  << (it).name() << endl
                  << "result.mailboxList[" << i << "].addrSpec.localPart:\n"