diff --git a/src/kmime_headers.cpp b/src/kmime_headers.cpp
index e8fa20f..126f92d 100644
--- a/src/kmime_headers.cpp
+++ b/src/kmime_headers.cpp
@@ -1,2159 +1,2158 @@
 /*  -*- c++ -*-
     kmime_headers.cpp
 
     KMime, the KDE Internet mail/usenet news message library.
     Copyright (c) 2001-2002 the KMime authors.
     See file AUTHORS for details
     Copyright (c) 2006 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.
 */
 /**
   @file
   This file is part of the API for handling @ref MIME data and
   defines the various header classes:
    - header's base class defining the common interface
    - generic base classes for different types of fields
    - incompatible, Structured-based field classes
    - compatible, Unstructured-based field classes
 
   @brief
   Defines the various headers classes.
 
   @authors the KMime authors (see AUTHORS file),
   Volker Krause \<vkrause@kde.org\>
 */
 
 #include "kmime_headers.h"
 #include "kmime_headers_p.h"
 
 #include "kmime_util.h"
 #include "kmime_util_p.h"
 #include "kmime_codecs.h"
 #include "kmime_content.h"
 #include "kmime_header_parsing.h"
 #include "kmime_headerfactory_p.h"
 #include "kmime_warning.h"
 
 
 #include <kcharsets.h>
 #include <KCodecs>
 
 #include <QTextCodec>
 #include <QString>
 #include <QStringList>
 
 #include <assert.h>
 #include <ctype.h>
 
 // macro to generate a default constructor implementation
 #define kmime_mk_trivial_ctor( subclass, baseclass )                  \
     subclass::subclass() : baseclass()           \
     {                                                                     \
     }                                                                     \
     \
     subclass::~subclass() {}
 
 // end kmime_mk_trivial_ctor
 
 #define kmime_mk_trivial_ctor_with_dptr( subclass, baseclass ) \
     subclass::subclass() : baseclass( new subclass##Private ) \
     {                                                                     \
     }                                                                     \
     \
     subclass::~subclass() { \
         Q_D(subclass); \
         delete d; \
         d_ptr = 0; \
     }
 
 // end kmime_mk_trivial_ctor_with_dptr
 
 #define kmime_mk_trivial_ctor_with_name( subclass, baseclass, name )  \
     kmime_mk_trivial_ctor( subclass, baseclass )                          \
     \
     const char *subclass::type() const                                    \
     {                                                                     \
         return staticType();                                                \
     }                                                                     \
     const char *subclass::staticType() { return #name; }
 
 #define kmime_mk_trivial_ctor_with_name_and_dptr( subclass, baseclass, name ) \
     kmime_mk_trivial_ctor_with_dptr( subclass, baseclass ) \
     const char *subclass::type() const { return staticType(); } \
     const char *subclass::staticType() { return #name; }
 
 #define kmime_mk_dptr_ctor( subclass, baseclass ) \
     subclass::subclass( subclass##Private *d ) : baseclass( d ) {}
 
 using namespace KMime;
 using namespace KMime::Headers;
 using namespace KMime::Types;
 using namespace KMime::HeaderParsing;
 
 namespace KMime
 {
 namespace Headers
 {
 //-----<Base>----------------------------------
 Base::Base() : d_ptr(new BasePrivate)
 {
 }
 
 Base::Base(BasePrivate *dd) :
     d_ptr(dd)
 {
 }
 
 Base::~Base()
 {
     delete d_ptr;
     d_ptr = nullptr;
 }
 
 void Base::from7BitString(const char *s, size_t len)
 {
     from7BitString(QByteArray::fromRawData(s, len));
 }
 
 QByteArray Base::rfc2047Charset() const
 {
     if (d_ptr->encCS.isEmpty()) {
         return Content::defaultCharset();
     } else {
         return d_ptr->encCS;
     }
 }
 
 void Base::setRFC2047Charset(const QByteArray &cs)
 {
     d_ptr->encCS = cachedCharset(cs);
 }
 
 const char *Base::type() const
 {
     return "";
 }
 
 bool Base::is(const char *t) const
 {
     return qstricmp(t, type()) == 0;
 }
 
 bool Base::isMimeHeader() const
 {
     return qstrnicmp(type(), "Content-", 8) == 0;
 }
 
 QByteArray Base::typeIntro() const
 {
     return QByteArray(type()) + ": ";
 }
 
 //-----</Base>---------------------------------
 
 namespace Generics
 {
 
 //-----<Unstructured>-------------------------
 
 //@cond PRIVATE
 kmime_mk_dptr_ctor(Unstructured, Base)
 //@endcond
 
 Unstructured::Unstructured() : Base(new UnstructuredPrivate)
 {
 }
 
 Unstructured::~Unstructured()
 {
     Q_D(Unstructured);
     delete d;
     d_ptr = nullptr;
 }
 
 void Unstructured::from7BitString(const QByteArray &s)
 {
     Q_D(Unstructured);
     d->decoded = KCodecs::decodeRFC2047String(s, &d->encCS, Content::defaultCharset());
 }
 
 QByteArray Unstructured::as7BitString(bool withHeaderType) const
 {
     const Q_D(Unstructured);
     QByteArray result;
     if (withHeaderType) {
         result = typeIntro();
     }
     result += encodeRFC2047String(d->decoded, d->encCS) ;
 
     return result;
 }
 
 void Unstructured::fromUnicodeString(const QString &s, const QByteArray &b)
 {
     Q_D(Unstructured);
     d->decoded = s;
     d->encCS = cachedCharset(b);
 }
 
 QString Unstructured::asUnicodeString() const
 {
     return d_func()->decoded;
 }
 
 void Unstructured::clear()
 {
     Q_D(Unstructured);
     d->decoded.truncate(0);
 }
 
 bool Unstructured::isEmpty() const
 {
     return d_func()->decoded.isEmpty();
 }
 
 //-----</Unstructured>-------------------------
 
 //-----<Structured>-------------------------
 
 Structured::Structured() : Base(new StructuredPrivate)
 {
 }
 
 kmime_mk_dptr_ctor(Structured, Base)
 
 Structured::~Structured()
 {
     Q_D(Structured);
     delete d;
     d_ptr = nullptr;
 }
 
 
 void Structured::from7BitString(const char *s, size_t len)
 {
     Q_D(Structured);
     if (d->encCS.isEmpty()) {
         d->encCS = Content::defaultCharset();
     }
     parse(s, s + len);
 }
 
 void Structured::from7BitString(const QByteArray &s)
 {
     from7BitString(s.constData(), s.length());
 }
 
 QString Structured::asUnicodeString() const
 {
     return QString::fromLatin1(as7BitString(false));
 }
 
 void Structured::fromUnicodeString(const QString &s, const QByteArray &b)
 {
     Q_D(Structured);
     d->encCS = cachedCharset(b);
     from7BitString(s.toLatin1());
 }
 
 //-----</Structured>-------------------------
 
 //-----<Address>-------------------------
 
 Address::Address() : Structured(new AddressPrivate)
 {
 }
 
 kmime_mk_dptr_ctor(Address, Structured)
 
 Address:: ~Address()
 {
 }
 
 // helper method used in AddressList and MailboxList
 static bool stringToMailbox(const QByteArray &address,
                             const QString &displayName, Types::Mailbox &mbox)
 {
     Types::AddrSpec addrSpec;
     mbox.setName(displayName);
     const char *cursor = address.constData();
     if (!parseAngleAddr(cursor, cursor + address.length(), addrSpec)) {
         if (!parseAddrSpec(cursor, cursor + address.length(), addrSpec)) {
             qWarning() << "stringToMailbox: Invalid address";
             return false;
         }
     }
     mbox.setAddress(addrSpec);
     return true;
 }
 
 //-----</Address>-------------------------
 
 //-----<MailboxList>-------------------------
 
 kmime_mk_trivial_ctor_with_dptr(MailboxList, Address)
 kmime_mk_dptr_ctor(MailboxList, Address)
 
 QByteArray MailboxList::as7BitString(bool withHeaderType) const
 {
     const Q_D(MailboxList);
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv = typeIntro();
     }
     foreach (const Types::Mailbox &mbox, d->mailboxList) {
         rv += mbox.as7BitString(d->encCS);
         rv += ", ";
     }
     rv.resize(rv.length() - 2);
     return rv;
 }
 
 void MailboxList::fromUnicodeString(const QString &s, const QByteArray &b)
 {
     Q_D(MailboxList);
     d->encCS = cachedCharset(b);
     from7BitString(encodeRFC2047Sentence(s, b));
 }
 
 QString MailboxList::asUnicodeString() const
 {
     Q_D(const MailboxList);
     return Mailbox::listToUnicodeString(d->mailboxList);
 }
 
 void MailboxList::clear()
 {
     Q_D(MailboxList);
     d->mailboxList.clear();
 }
 
 bool MailboxList::isEmpty() const
 {
     return d_func()->mailboxList.isEmpty();
 }
 
 void MailboxList::addAddress(const Types::Mailbox &mbox)
 {
     Q_D(MailboxList);
     d->mailboxList.append(mbox);
 }
 
 void MailboxList::addAddress(const QByteArray &address,
                              const QString &displayName)
 {
     Q_D(MailboxList);
     Types::Mailbox mbox;
     if (stringToMailbox(address, displayName, mbox)) {
         d->mailboxList.append(mbox);
     }
 }
 
 QVector<QByteArray> MailboxList::addresses() const
 {
     QVector<QByteArray> rv;
     rv.reserve(d_func()->mailboxList.count());
     foreach (const Types::Mailbox &mbox, d_func()->mailboxList) {
         rv.append(mbox.address());
     }
     return rv;
 }
 
 QStringList MailboxList::displayNames() const
 {
     Q_D(const MailboxList);
     QStringList rv;
     rv.reserve(d->mailboxList.count());
     foreach (const Types::Mailbox &mbox, d->mailboxList) {
         if (mbox.hasName())
             rv.append(mbox.name());
         else
             rv.append(QString::fromLatin1(mbox.address()));
     }
     return rv;
 }
 
 QString MailboxList::displayString() const
 {
     Q_D(const MailboxList);
     if (d->mailboxList.size() == 1) { // fast-path to avoid temporary QStringList in the common case of just one From address
         const auto& mbox = d->mailboxList.at(0);
         if (mbox.hasName())
             return mbox.name();
         else
             return QString::fromLatin1(mbox.address());
     }
     return displayNames().join(QStringLiteral(", "));
 }
 
 Types::Mailbox::List MailboxList::mailboxes() const
 {
     return d_func()->mailboxList;
 }
 
 bool MailboxList::parse(const char *&scursor, const char *const send,
                         bool isCRLF)
 {
     Q_D(MailboxList);
     // examples:
     // from := "From:" mailbox-list CRLF
     // sender := "Sender:" mailbox CRLF
 
     // parse an address-list:
     QVector<Types::Address> maybeAddressList;
     if (!parseAddressList(scursor, send, maybeAddressList, isCRLF)) {
         return false;
     }
 
     d->mailboxList.clear();
     d->mailboxList.reserve(maybeAddressList.count());
 
     // extract the mailboxes and complain if there are groups:
     foreach (const auto &it, maybeAddressList) {
         if (!(it).displayName.isEmpty()) {
             KMIME_WARN << "mailbox groups in header disallowing them! Name: \""
                        << (it).displayName << "\"" << endl;
         }
         d->mailboxList += (it).mailboxList;
     }
     return true;
 }
 
 //-----</MailboxList>-------------------------
 
 //-----<SingleMailbox>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(SingleMailbox, MailboxList)
 //@endcond
 
 bool SingleMailbox::parse(const char *&scursor, const char *const send,
                           bool isCRLF)
 {
     Q_D(MailboxList);
     if (!MailboxList::parse(scursor, send, isCRLF)) {
         return false;
     }
 
     if (d->mailboxList.count() > 1) {
         KMIME_WARN << "multiple mailboxes in header allowing only a single one!"
                    << endl;
     }
     return true;
 }
 
 //-----</SingleMailbox>-------------------------
 
 //-----<AddressList>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(AddressList, Address)
 kmime_mk_dptr_ctor(AddressList, Address)
 //@endcond
 
 QByteArray AddressList::as7BitString(bool withHeaderType) const
 {
     const Q_D(AddressList);
     if (d->addressList.isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv = typeIntro();
     }
     foreach (const Types::Address &addr, d->addressList) {
         foreach (const Types::Mailbox &mbox, addr.mailboxList) {
             rv += mbox.as7BitString(d->encCS);
             rv += ", ";
         }
     }
     rv.resize(rv.length() - 2);
     return rv;
 }
 
 void AddressList::fromUnicodeString(const QString &s, const QByteArray &b)
 {
     Q_D(AddressList);
     d->encCS = cachedCharset(b);
     from7BitString(encodeRFC2047Sentence(s, b));
 }
 
 QString AddressList::asUnicodeString() const
 {
     Q_D(const AddressList);
     QStringList rv;
     foreach (const Types::Address &addr, d->addressList) {
         rv.reserve(rv.size() + addr.mailboxList.size());
         foreach (const Types::Mailbox &mbox, addr.mailboxList) {
             rv.append(mbox.prettyAddress());
         }
     }
     return rv.join(QStringLiteral(", "));
 }
 
 void AddressList::clear()
 {
     Q_D(AddressList);
     d->addressList.clear();
 }
 
 bool AddressList::isEmpty() const
 {
     return d_func()->addressList.isEmpty();
 }
 
 void AddressList::addAddress(const Types::Mailbox &mbox)
 {
     Q_D(AddressList);
     Types::Address addr;
     addr.mailboxList.append(mbox);
     d->addressList.append(addr);
 }
 
 void AddressList::addAddress(const QByteArray &address,
                              const QString &displayName)
 {
     Q_D(AddressList);
     Types::Address addr;
     Types::Mailbox mbox;
     if (stringToMailbox(address, displayName, mbox)) {
         addr.mailboxList.append(mbox);
         d->addressList.append(addr);
     }
 }
 
 QVector<QByteArray> AddressList::addresses() const
 {
     QVector<QByteArray> rv;
     foreach (const Types::Address &addr, d_func()->addressList) {
         foreach (const Types::Mailbox &mbox, addr.mailboxList) {
             rv.append(mbox.address());
         }
     }
     return rv;
 }
 
 QStringList AddressList::displayNames() const
 {
     Q_D(const AddressList);
     QStringList rv;
     foreach (const Types::Address &addr, d->addressList) {
         foreach (const Types::Mailbox &mbox, addr.mailboxList) {
             if (mbox.hasName())
                 rv.append(mbox.name());
             else
                 rv.append(QString::fromLatin1(mbox.address()));
         }
     }
     return rv;
 }
 
 QString AddressList::displayString() const
 {
     // optimize for single entry and avoid creation of the QStringList in that case?
     return displayNames().join(QStringLiteral(", "));
 }
 
 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) {
             rv.append(mbox);
         }
     }
     return rv;
 }
 
 bool AddressList::parse(const char *&scursor, const char *const send,
                         bool isCRLF)
 {
     Q_D(AddressList);
     QVector<Types::Address> maybeAddressList;
     if (!parseAddressList(scursor, send, maybeAddressList, isCRLF)) {
         return false;
     }
 
     d->addressList = maybeAddressList;
     return true;
 }
 
 //-----</AddressList>-------------------------
 
 //-----<Token>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(Token, Structured)
 kmime_mk_dptr_ctor(Token, Structured)
 //@endcond
 
 QByteArray Token::as7BitString(bool withHeaderType) const
 {
     if (isEmpty()) {
         return QByteArray();
     }
     if (withHeaderType) {
         return typeIntro() + d_func()->token;
     }
     return d_func()->token;
 }
 
 void Token::clear()
 {
     Q_D(Token);
     d->token.clear();
 }
 
 bool Token::isEmpty() const
 {
     return d_func()->token.isEmpty();
 }
 
 QByteArray Token::token() const
 {
     return d_func()->token;
 }
 
 void Token::setToken(const QByteArray &t)
 {
     Q_D(Token);
     d->token = t;
 }
 
 bool Token::parse(const char *&scursor, const char *const send, bool isCRLF)
 {
     Q_D(Token);
     clear();
     eatCFWS(scursor, send, isCRLF);
     // must not be empty:
     if (scursor == send) {
         return false;
     }
 
     QPair<const char *, int> maybeToken;
     if (!parseToken(scursor, send, maybeToken, ParseTokenNoFlag)) {
         return false;
     }
     d->token = QByteArray(maybeToken.first, maybeToken.second);
 
     // complain if trailing garbage is found:
     eatCFWS(scursor, send, isCRLF);
     if (scursor != send) {
         KMIME_WARN << "trailing garbage after token in header allowing "
                    "only a single token!" << endl;
     }
     return true;
 }
 
 //-----</Token>-------------------------
 
 //-----<PhraseList>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(PhraseList, Structured)
 //@endcond
 
 QByteArray PhraseList::as7BitString(bool withHeaderType) const
 {
     const Q_D(PhraseList);
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv = typeIntro();
     }
 
     for (int i = 0; i < d->phraseList.count(); ++i) {
         // FIXME: only encode when needed, quote when needed, etc.
         rv += encodeRFC2047String(d->phraseList[i], d->encCS, false, false);
         if (i != d->phraseList.count() - 1) {
             rv += ", ";
         }
     }
 
     return rv;
 }
 
 QString PhraseList::asUnicodeString() const
 {
     return d_func()->phraseList.join(QStringLiteral(", "));
 }
 
 void PhraseList::clear()
 {
     Q_D(PhraseList);
     d->phraseList.clear();
 }
 
 bool PhraseList::isEmpty() const
 {
     return d_func()->phraseList.isEmpty();
 }
 
 QStringList PhraseList::phrases() const
 {
     return d_func()->phraseList;
 }
 
 bool PhraseList::parse(const char *&scursor, const char *const send,
                        bool isCRLF)
 {
     Q_D(PhraseList);
     d->phraseList.clear();
 
     while (scursor != send) {
         eatCFWS(scursor, send, isCRLF);
         // empty entry ending the list: OK.
         if (scursor == send) {
             return true;
         }
         // empty entry: ignore.
         if (*scursor == ',') {
             scursor++;
             continue;
         }
 
         QString maybePhrase;
         if (!parsePhrase(scursor, send, maybePhrase, isCRLF)) {
             return false;
         }
         d->phraseList.append(maybePhrase);
 
         eatCFWS(scursor, send, isCRLF);
         // non-empty entry ending the list: OK.
         if (scursor == send) {
             return true;
         }
         // comma separating the phrases: eat.
         if (*scursor == ',') {
             scursor++;
         }
     }
     return true;
 }
 
 //-----</PhraseList>-------------------------
 
 //-----<DotAtom>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(DotAtom, Structured)
 //@endcond
 
 QByteArray DotAtom::as7BitString(bool withHeaderType) const
 {
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
 
     rv += d_func()->dotAtom.toLatin1(); // FIXME: encoding?
     return rv;
 }
 
 QString DotAtom::asUnicodeString() const
 {
     return d_func()->dotAtom;
 }
 
 void DotAtom::clear()
 {
     Q_D(DotAtom);
     d->dotAtom.clear();
 }
 
 bool DotAtom::isEmpty() const
 {
     return d_func()->dotAtom.isEmpty();
 }
 
 bool DotAtom::parse(const char *&scursor, const char *const send,
                     bool isCRLF)
 {
     Q_D(DotAtom);
     QString maybeDotAtom;
     if (!parseDotAtom(scursor, send, maybeDotAtom, isCRLF)) {
         return false;
     }
 
     d->dotAtom = maybeDotAtom;
 
     eatCFWS(scursor, send, isCRLF);
     if (scursor != send) {
         KMIME_WARN << "trailing garbage after dot-atom in header allowing "
                    "only a single dot-atom!" << endl;
     }
     return true;
 }
 
 //-----</DotAtom>-------------------------
 
 //-----<Parametrized>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(Parametrized, Structured)
 kmime_mk_dptr_ctor(Parametrized, Structured)
 //@endcond
 
 QByteArray Parametrized::as7BitString(bool withHeaderType) const
 {
     const Q_D(Parametrized);
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
 
     bool first = true;
     for (QMap<QString, QString>::ConstIterator it = d->parameterHash.constBegin();
             it != d->parameterHash.constEnd(); ++it) {
         if (!first) {
             rv += "; ";
         } else {
             first = false;
         }
         if (isUsAscii(it.value())) {
             rv += it.key().toLatin1() + '=';
             QByteArray tmp = it.value().toLatin1();
             addQuotes(tmp, true);   // force quoting, eg. for whitespaces in parameter value
             rv += tmp;
         } else {
             if (useOutlookAttachmentEncoding()) {
                 rv += it.key().toLatin1() + '=';
                 qDebug() << "doing:" << it.value() << QLatin1String(d->encCS);
                 rv += "\"" + encodeRFC2047String(it.value(), d->encCS) + "\"";
             } else {
                 rv += it.key().toLatin1() + "*=";
                 rv += encodeRFC2231String(it.value(), d->encCS);
             }
         }
     }
 
     return rv;
 }
 
 QString Parametrized::parameter(const QString &key) const
 {
     return d_func()->parameterHash.value(key.toLower());
 }
 
 bool Parametrized::hasParameter(const QString &key) const
 {
     return d_func()->parameterHash.contains(key.toLower());
 }
 
 void Parametrized::setParameter(const QString &key, const QString &value)
 {
     Q_D(Parametrized);
     d->parameterHash.insert(key.toLower(), value);
 }
 
 bool Parametrized::isEmpty() const
 {
     return d_func()->parameterHash.isEmpty();
 }
 
 void Parametrized::clear()
 {
     Q_D(Parametrized);
     d->parameterHash.clear();
 }
 
 bool Parametrized::parse(const char  *&scursor, const char *const send,
                          bool isCRLF)
 {
     Q_D(Parametrized);
     d->parameterHash.clear();
     QByteArray charset;
     if (!parseParameterListWithCharset(scursor, send, d->parameterHash, charset, isCRLF)) {
         return false;
     }
     d->encCS = charset;
     return true;
 }
 
 //-----</Parametrized>-------------------------
 
 //-----<Ident>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(Ident, Address)
 kmime_mk_dptr_ctor(Ident, Address)
 //@endcond
 
 QByteArray Ident::as7BitString(bool withHeaderType) const
 {
     const Q_D(Ident);
     if (d->msgIdList.isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv = typeIntro();
     }
     foreach (const Types::AddrSpec &addr, d->msgIdList) {
         if (!addr.isEmpty()) {
             const QString asString = addr.asString();
             rv += '<';
             if (!asString.isEmpty()) {
                 rv += asString.toLatin1(); // FIXME: change parsing to use QByteArrays
             }
             rv += "> ";
         }
     }
     if (!rv.isEmpty()) {
         rv.resize(rv.length() - 1);
     }
     return rv;
 }
 
 void Ident::clear()
 {
     Q_D(Ident);
     d->msgIdList.clear();
     d->cachedIdentifier.clear();
 }
 
 bool Ident::isEmpty() const
 {
     return d_func()->msgIdList.isEmpty();
 }
 
 bool Ident::parse(const char *&scursor, const char *const send, bool isCRLF)
 {
     Q_D(Ident);
     // msg-id   := "<" id-left "@" id-right ">"
     // id-left  := dot-atom-text / no-fold-quote / local-part
     // id-right := dot-atom-text / no-fold-literal / domain
     //
     // equivalent to:
     // msg-id   := angle-addr
 
     d->msgIdList.clear();
     d->cachedIdentifier.clear();
 
     while (scursor != send) {
         eatCFWS(scursor, send, isCRLF);
         // empty entry ending the list: OK.
         if (scursor == send) {
             return true;
         }
         // empty entry: ignore.
         if (*scursor == ',') {
             scursor++;
             continue;
         }
 
         AddrSpec maybeMsgId;
         if (!parseAngleAddr(scursor, send, maybeMsgId, isCRLF)) {
             return false;
         }
         d->msgIdList.append(maybeMsgId);
 
         eatCFWS(scursor, send, isCRLF);
         // header end ending the list: OK.
         if (scursor == send) {
             return true;
         }
         // regular item separator: eat it.
         if (*scursor == ',') {
             scursor++;
         }
     }
     return true;
 }
 
 QVector<QByteArray> Ident::identifiers() const
 {
     QVector<QByteArray> rv;
     foreach (const Types::AddrSpec &addr, d_func()->msgIdList) {
         if (!addr.isEmpty()) {
             const QString asString = addr.asString();
             if (!asString.isEmpty()) {
                 rv.append(asString.toLatin1());   // FIXME: change parsing to use QByteArrays
             }
         }
     }
     return rv;
 }
 
 void Ident::fromIdent(const Ident* ident)
 {
     d_func()->encCS = ident->d_func()->encCS;
     d_func()->msgIdList = ident->d_func()->msgIdList;
     d_func()->cachedIdentifier = ident->d_func()->cachedIdentifier;
 }
 
 void Ident::appendIdentifier(const QByteArray &id)
 {
     Q_D(Ident);
     QByteArray tmp = id;
     if (!tmp.startsWith('<')) {
         tmp.prepend('<');
     }
     if (!tmp.endsWith('>')) {
         tmp.append('>');
     }
     AddrSpec msgId;
     const char *cursor = tmp.constData();
     if (parseAngleAddr(cursor, cursor + tmp.length(), msgId)) {
         d->msgIdList.append(msgId);
     } else {
         qWarning() << "Unable to parse address spec!";
     }
 }
 
 //-----</Ident>-------------------------
 
 //-----<SingleIdent>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_dptr(SingleIdent, Ident)
 kmime_mk_dptr_ctor(SingleIdent, Ident)
 //@endcond
 
 QByteArray SingleIdent::identifier() const
 {
     if (d_func()->msgIdList.isEmpty()) {
         return QByteArray();
     }
 
     if (d_func()->cachedIdentifier.isEmpty()) {
         const Types::AddrSpec &addr = d_func()->msgIdList.first();
         if (!addr.isEmpty()) {
             const QString asString = addr.asString();
             if (!asString.isEmpty()) {
                 d_func()->cachedIdentifier = asString.toLatin1();// FIXME: change parsing to use QByteArrays
             }
         }
     }
 
     return d_func()->cachedIdentifier;
 }
 
 void SingleIdent::setIdentifier(const QByteArray &id)
 {
     Q_D(SingleIdent);
     d->msgIdList.clear();
     d->cachedIdentifier.clear();
     appendIdentifier(id);
 }
 
 bool SingleIdent::parse(const char *&scursor, const char *const send,
                         bool isCRLF)
 {
     Q_D(SingleIdent);
     if (!Ident::parse(scursor, send, isCRLF)) {
         return false;
     }
 
     if (d->msgIdList.count() > 1) {
         KMIME_WARN << "more than one msg-id in header "
                    << "allowing only a single one!" << endl;
     }
     return true;
 }
 
 //-----</SingleIdent>-------------------------
 
 } // namespace Generics
 
 //-----<ReturnPath>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(ReturnPath, Generics::Address, Return-Path)
 //@endcond
 
 QByteArray ReturnPath::as7BitString(bool withHeaderType) const
 {
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
     rv += '<' + d_func()->mailbox.as7BitString(d_func()->encCS) + '>';
     return rv;
 }
 
 void ReturnPath::clear()
 {
     Q_D(ReturnPath);
     d->mailbox.setAddress(Types::AddrSpec());
     d->mailbox.setName(QString());
 }
 
 bool ReturnPath::isEmpty() const
 {
     const Q_D(ReturnPath);
     return !d->mailbox.hasAddress() && !d->mailbox.hasName();
 }
 
 bool ReturnPath::parse(const char *&scursor, const char *const send,
                        bool isCRLF)
 {
     Q_D(ReturnPath);
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         return false;
     }
 
     const char *oldscursor = scursor;
 
     Mailbox maybeMailbox;
     if (!parseMailbox(scursor, send, maybeMailbox, isCRLF)) {
         // mailbox parsing failed, but check for empty brackets:
         scursor = oldscursor;
         if (*scursor != '<') {
             return false;
         }
         scursor++;
         eatCFWS(scursor, send, isCRLF);
         if (scursor == send || *scursor != '>') {
             return false;
         }
         scursor++;
 
         // prepare a Null mailbox:
         AddrSpec emptyAddrSpec;
         maybeMailbox.setName(QString());
         maybeMailbox.setAddress(emptyAddrSpec);
     } else {
         // check that there was no display-name:
         if (maybeMailbox.hasName()) {
             KMIME_WARN << "display-name \"" << maybeMailbox.name()
                        << "\" in Return-Path!" << endl;
         }
     }
     d->mailbox = maybeMailbox;
 
     // see if that was all:
     eatCFWS(scursor, send, isCRLF);
     // and warn if it wasn't:
     if (scursor != send) {
         KMIME_WARN << "trailing garbage after angle-addr in Return-Path!" << endl;
     }
     return true;
 }
 
 //-----</ReturnPath>-------------------------
 
 //-----<Generic>-------------------------------
 
 // NOTE: Do *not* register Generic with HeaderFactory, since its type() is changeable.
 
 Generic::Generic() : Generics::Unstructured(new GenericPrivate)
 {
 }
 
 Generic::Generic(const char *t, int len) : Generics::Unstructured(new GenericPrivate)
 {
     setType(t, len);
 }
 
 Generic::~Generic()
 {
     Q_D(Generic);
     delete d;
     d_ptr = nullptr;
 }
 
 void Generic::clear()
 {
     Q_D(Generic);
     delete[] d->type;
     d->type = nullptr;
     Unstructured::clear();
 }
 
 bool Generic::isEmpty() const
 {
     return d_func()->type == nullptr || Unstructured::isEmpty();
 }
 
 const char *Generic::type() const
 {
     return d_func()->type;
 }
 
 void Generic::setType(const char *type, int len)
 {
     Q_D(Generic);
     if (d->type) {
         delete[] d->type;
     }
     if (type) {
         const int l = (len < 0 ? strlen(type) : len) + 1;
         d->type = new char[l];
         qstrncpy(d->type, type, l);
     } else {
         d->type = nullptr;
     }
 }
 
 //-----<Generic>-------------------------------
 
 //-----<MessageID>-----------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name(MessageID, Generics::SingleIdent, Message-ID)
 //@endcond
 
 void MessageID::generate(const QByteArray &fqdn)
 {
     setIdentifier('<' + uniqueString() + '@' + fqdn + '>');
 }
 
 //-----</MessageID>----------------------------
 
 //-----<Control>-------------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(Control, Generics::Structured, Control)
 //@endcond
 
 QByteArray Control::as7BitString(bool withHeaderType) const
 {
     const Q_D(Control);
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
 
     rv += d->name;
     if (!d->parameter.isEmpty()) {
         rv += ' ' + d->parameter;
     }
     return rv;
 }
 
 void Control::clear()
 {
     Q_D(Control);
     d->name.clear();
     d->parameter.clear();
 }
 
 bool Control::isEmpty() const
 {
     return d_func()->name.isEmpty();
 }
 
 QByteArray Control::controlType() const
 {
     return d_func()->name;
 }
 
 QByteArray Control::parameter() const
 {
     return d_func()->parameter;
 }
 
 bool Control::isCancel() const
 {
     return d_func()->name.toLower() == "cancel";
 }
 
 void Control::setCancel(const QByteArray &msgid)
 {
     Q_D(Control);
     d->name = "cancel";
     d->parameter = msgid;
 }
 
 bool Control::parse(const char *&scursor, const char *const send, bool isCRLF)
 {
     Q_D(Control);
     clear();
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         return false;
     }
     const char *start = scursor;
     while (scursor != send && !isspace(*scursor)) {
         ++scursor;
     }
     d->name = QByteArray(start, scursor - start);
     eatCFWS(scursor, send, isCRLF);
     d->parameter = QByteArray(scursor, send - scursor);
     return true;
 }
 
 //-----</Control>------------------------------
 
 //-----<MailCopiesTo>--------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(MailCopiesTo,
         Generics::AddressList, Mail-Copies-To)
 //@endcond
 
 QByteArray MailCopiesTo::as7BitString(bool withHeaderType) const
 {
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
     if (!AddressList::isEmpty()) {
         rv += AddressList::as7BitString(false);
     } else {
         if (d_func()->alwaysCopy) {
             rv += "poster";
         } else if (d_func()->neverCopy) {
             rv += "nobody";
         }
     }
     return rv;
 }
 
 QString MailCopiesTo::asUnicodeString() const
 {
     if (!AddressList::isEmpty()) {
         return AddressList::asUnicodeString();
     }
     if (d_func()->alwaysCopy) {
         return QStringLiteral("poster");
     }
     if (d_func()->neverCopy) {
         return QStringLiteral("nobody");
     }
     return QString();
 }
 
 void MailCopiesTo::clear()
 {
     Q_D(MailCopiesTo);
     AddressList::clear();
     d->alwaysCopy = false;
     d->neverCopy = false;
 }
 
 bool MailCopiesTo::isEmpty() const
 {
     return AddressList::isEmpty() && !(d_func()->alwaysCopy || d_func()->neverCopy);
 }
 
 bool MailCopiesTo::alwaysCopy() const
 {
     return !AddressList::isEmpty() || d_func()->alwaysCopy;
 }
 
 void MailCopiesTo::setAlwaysCopy()
 {
     Q_D(MailCopiesTo);
     clear();
     d->alwaysCopy = true;
 }
 
 bool MailCopiesTo::neverCopy() const
 {
     return d_func()->neverCopy;
 }
 
 void MailCopiesTo::setNeverCopy()
 {
     Q_D(MailCopiesTo);
     clear();
     d->neverCopy = true;
 }
 
 bool MailCopiesTo::parse(const char  *&scursor, const char *const send,
                          bool isCRLF)
 {
     Q_D(MailCopiesTo);
     clear();
     if (send - scursor == 5) {
         if (qstrnicmp("never", scursor, 5) == 0) {
             d->neverCopy = true;
             return true;
         }
     }
     if (send - scursor == 6) {
         if (qstrnicmp("always", scursor, 6) == 0 || qstrnicmp("poster", scursor, 6) == 0) {
             d->alwaysCopy = true;
             return true;
         }
         if (qstrnicmp("nobody", scursor, 6) == 0) {
             d->neverCopy = true;
             return true;
         }
     }
     return AddressList::parse(scursor, send, isCRLF);
 }
 
 //-----</MailCopiesTo>-------------------------
 
 //-----<Date>----------------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(Date, Generics::Structured, Date)
 //@endcond
 
 QByteArray Date::as7BitString(bool withHeaderType) const
 {
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
     //QT5 fix port to QDateTime Qt::RFC2822Date is not enough we need to fix it. We need to use QLocale("C") + add "ddd, ";
     //rv += d_func()->dateTime.toString(  Qt::RFC2822Date ).toLatin1();
     rv += QLocale::c().toString(d_func()->dateTime, QStringLiteral("ddd, ")).toLatin1();
     rv += d_func()->dateTime.toString(Qt::RFC2822Date).toLatin1();
 
     return rv;
 }
 
 void Date::clear() {
     Q_D(Date);
     d->dateTime = QDateTime();
 }
 
 bool Date::isEmpty() const {
     return d_func()->dateTime.isNull() || !d_func()->dateTime.isValid();
 }
 
 QDateTime Date::dateTime() const {
     return d_func()->dateTime;
 }
 
 void Date::setDateTime(const QDateTime & dt) {
     Q_D(Date);
     d->dateTime = dt;
 }
 
 int Date::ageInDays() const {
     QDate today = QDate::currentDate();
     return dateTime().date().daysTo(today);
 }
 
 bool Date::parse(const char *&scursor, const char *const send, bool isCRLF) {
     Q_D(Date);
     return parseDateTime(scursor, send, d->dateTime, isCRLF);
 }
 
 //-----</Date>---------------------------------
 
 //-----<Newsgroups>----------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(Newsgroups, Generics::Structured, Newsgroups)
 kmime_mk_trivial_ctor_with_name(FollowUpTo, Newsgroups, Followup-To)
 //@endcond
 
 QByteArray Newsgroups::as7BitString(bool withHeaderType) const {
     const Q_D(Newsgroups);
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
 
     for (int i = 0; i < d->groups.count(); ++i) {
         rv += d->groups[ i ];
         if (i != d->groups.count() - 1) {
             rv += ',';
         }
     }
     return rv;
 }
 
 void Newsgroups::fromUnicodeString(const QString & s, const QByteArray & b) {
     Q_UNUSED(b);
     Q_D(Newsgroups);
     from7BitString(s.toUtf8());
     d->encCS = cachedCharset("UTF-8");
 }
 
 QString Newsgroups::asUnicodeString() const {
     return QString::fromUtf8(as7BitString(false));
 }
 
 void Newsgroups::clear() {
     Q_D(Newsgroups);
     d->groups.clear();
 }
 
 bool Newsgroups::isEmpty() const {
     return d_func()->groups.isEmpty();
 }
 
 QVector<QByteArray> Newsgroups::groups() const {
     return d_func()->groups;
 }
 
 void Newsgroups::setGroups(const QVector<QByteArray> &groups) {
     Q_D(Newsgroups);
     d->groups = groups;
 }
 
 bool Newsgroups::isCrossposted() const {
     return d_func()->groups.count() >= 2;
 }
 
 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);
     }
     return true;
 }
 
 //-----</Newsgroups>---------------------------
 
 //-----<Lines>---------------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(Lines, Generics::Structured, Lines)
 //@endcond
 
 QByteArray Lines::as7BitString(bool withHeaderType) const {
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray num;
     num.setNum(d_func()->lines);
 
     if (withHeaderType) {
         return typeIntro() + num;
     }
     return num;
 }
 
 QString Lines::asUnicodeString() const {
     if (isEmpty()) {
         return QString();
     }
     return QString::number(d_func()->lines);
 }
 
 void Lines::clear() {
     Q_D(Lines);
     d->lines = -1;
 }
 
 bool Lines::isEmpty() const {
     return d_func()->lines == -1;
 }
 
 int Lines::numberOfLines() const {
     return d_func()->lines;
 }
 
 void Lines::setNumberOfLines(int lines) {
     Q_D(Lines);
     d->lines = lines;
 }
 
 bool Lines::parse(const char *&scursor, const char *const send, bool isCRLF) {
     Q_D(Lines);
     eatCFWS(scursor, send, isCRLF);
     if (parseDigits(scursor, send, d->lines)  == 0) {
         clear();
         return false;
     }
     return true;
 }
 
 //-----</Lines>--------------------------------
 
 //-----<Content-Type>--------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(ContentType, Generics::Parametrized,
             Content-Type)
 //@endcond
 
 bool ContentType::isEmpty() const {
     return d_func()->mimeType.isEmpty();
 }
 
 void ContentType::clear() {
     Q_D(ContentType);
     d->category = CCsingle;
     d->mimeType.clear();
     Parametrized::clear();
 }
 
 QByteArray ContentType::as7BitString(bool withHeaderType) const {
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
 
     rv += mimeType();
     if (!Parametrized::isEmpty()) {
         rv += "; " + Parametrized::as7BitString(false);
     }
 
     return rv;
 }
 
 QByteArray ContentType::mimeType() const {
     Q_D(const ContentType);
     return d->mimeType;
 }
 
 QByteArray ContentType::mediaType() const {
     Q_D(const ContentType);
     const int pos = d->mimeType.indexOf('/');
     if (pos < 0) {
         return d->mimeType;
     } else {
         return d->mimeType.left(pos);
     }
 }
 
 QByteArray ContentType::subType() const {
     Q_D(const ContentType);
     const int pos = d->mimeType.indexOf('/');
     if (pos < 0) {
         return QByteArray();
     } else {
         return d->mimeType.mid(pos + 1);
     }
 }
 
 void ContentType::setMimeType(const QByteArray & mimeType) {
     Q_D(ContentType);
     d->mimeType = mimeType;
-    Parametrized::clear();
 
     if (isMultipart()) {
         d->category = CCcontainer;
     } else {
         d->category = CCsingle;
     }
 }
 
 bool ContentType::isMediatype(const char *mediatype) const {
     Q_D(const ContentType);
     const int len = strlen(mediatype);
     return qstrnicmp(d->mimeType.constData(), mediatype, len) == 0 &&
             (d->mimeType.at(len) == '/' || d->mimeType.size() == len);
 }
 
 bool ContentType::isSubtype(const char *subtype) const {
     Q_D(const ContentType);
     const int pos = d->mimeType.indexOf('/');
     if (pos < 0) {
         return false;
     }
     const int len = strlen(subtype);
     return qstrnicmp(d->mimeType.constData() + pos + 1, subtype, len) == 0 &&
             d->mimeType.size() == pos + len + 1;
 }
 
 bool ContentType::isMimeType(const char* mimeType) const
 {
     Q_D(const ContentType);
     return qstricmp(d->mimeType.constData(), mimeType) == 0;
 }
 
 bool ContentType::isText() const {
     return (isMediatype("text") || isEmpty());
 }
 
 bool ContentType::isPlainText() const {
     return (qstricmp(d_func()->mimeType.constData(), "text/plain") == 0 || isEmpty());
 }
 
 bool ContentType::isHTMLText() const {
     return qstricmp(d_func()->mimeType.constData(), "text/html") == 0;
 }
 
 bool ContentType::isImage() const {
     return isMediatype("image");
 }
 
 bool ContentType::isMultipart() const {
     return isMediatype("multipart");
 }
 
 bool ContentType::isPartial() const {
     return qstricmp(d_func()->mimeType.constData(), "message/partial") == 0;
 }
 
 QByteArray ContentType::charset() const {
     QByteArray ret = parameter(QStringLiteral("charset")).toLatin1();
     if (ret.isEmpty()) {
         //return the default-charset if necessary
         ret = Content::defaultCharset();
     }
     return ret;
 }
 
 void ContentType::setCharset(const QByteArray & s) {
     setParameter(QStringLiteral("charset"), QString::fromLatin1(s));
 }
 
 QByteArray ContentType::boundary() const {
     return parameter(QStringLiteral("boundary")).toLatin1();
 }
 
 void ContentType::setBoundary(const QByteArray & s) {
     setParameter(QStringLiteral("boundary"), QString::fromLatin1(s));
 }
 
 QString ContentType::name() const {
     return parameter(QStringLiteral("name"));
 }
 
 void ContentType::setName(const QString & s, const QByteArray & cs) {
     Q_D(ContentType);
     d->encCS = cs;
     setParameter(QStringLiteral("name"), s);
 }
 
 QByteArray ContentType::id() const {
     return parameter(QStringLiteral("id")).toLatin1();
 }
 
 void ContentType::setId(const QByteArray & s) {
     setParameter(QStringLiteral("id"), QString::fromLatin1(s));
 }
 
 int ContentType::partialNumber() const {
     QByteArray p = parameter(QStringLiteral("number")).toLatin1();
     if (!p.isEmpty()) {
         return p.toInt();
     } else {
         return -1;
     }
 }
 
 int ContentType::partialCount() const {
     QByteArray p = parameter(QStringLiteral("total")).toLatin1();
     if (!p.isEmpty()) {
         return p.toInt();
     } else {
         return -1;
     }
 }
 
 contentCategory ContentType::category() const {
     return d_func()->category;
 }
 
 void ContentType::setCategory(contentCategory c) {
     Q_D(ContentType);
     d->category = c;
 }
 
 void ContentType::setPartialParams(int total, int number) {
     setParameter(QStringLiteral("number"), QString::number(number));
     setParameter(QStringLiteral("total"), QString::number(total));
 }
 
 bool ContentType::parse(const char *&scursor, const char *const send,
                         bool isCRLF) {
     Q_D(ContentType);
     // content-type: type "/" subtype *(";" parameter)
     clear();
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         return false; // empty header
     }
 
     // type
     QPair<const char *, int> maybeMimeType;
     if (!parseToken(scursor, send, maybeMimeType, ParseTokenNoFlag)) {
         return false;
     }
 
     // subtype
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send || *scursor != '/') {
         return false;
     }
     scursor++;
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         return false;
     }
 
     QPair<const char *, int> maybeSubType;
     if (!parseToken(scursor, send, maybeSubType, ParseTokenNoFlag)) {
         return false;
     }
 
     d->mimeType.reserve(maybeMimeType.second + maybeSubType.second + 1);
     d->mimeType = QByteArray(maybeMimeType.first, maybeMimeType.second).toLower()
                     + '/' + QByteArray(maybeSubType.first, maybeSubType.second).toLower();
 
     // parameter list
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         goto success; // no parameters
     }
 
     if (*scursor != ';') {
         return false;
     }
     scursor++;
 
     if (!Parametrized::parse(scursor, send, isCRLF)) {
         return false;
     }
 
     // adjust category
 success:
     if (isMultipart()) {
         d->category = CCcontainer;
     } else {
         d->category = CCsingle;
     }
     return true;
 }
 
 //-----</Content-Type>-------------------------
 
 //-----<ContentID>----------------------
 
 kmime_mk_trivial_ctor_with_name_and_dptr(ContentID, SingleIdent, Content-ID)
 kmime_mk_dptr_ctor(ContentID, SingleIdent)
 
 bool ContentID::parse(const char *&scursor, const char *const send, bool isCRLF) {
     Q_D(ContentID);
     // Content-id := "<" contentid ">"
     // contentid := now whitespaces
 
     const char *origscursor = scursor;
     if (!SingleIdent::parse(scursor, send, isCRLF)) {
         scursor = origscursor;
         d->msgIdList.clear();
         d->cachedIdentifier.clear();
 
         while (scursor != send) {
             eatCFWS(scursor, send, isCRLF);
             // empty entry ending the list: OK.
             if (scursor == send) {
                 return true;
             }
             // empty entry: ignore.
             if (*scursor == ',') {
                 scursor++;
                 continue;
             }
 
             AddrSpec maybeContentId;
             // Almost parseAngleAddr
             if (scursor == send || *scursor != '<') {
                 return false;
             }
             scursor++; // eat '<'
 
             eatCFWS(scursor, send, isCRLF);
             if (scursor == send) {
                 return false;
             }
 
             // Save chars untill '>''
             QString result;
             if (!parseDotAtom(scursor, send, result, false)) {
                 return false;
             }
 
             eatCFWS(scursor, send, isCRLF);
             if (scursor == send || *scursor != '>') {
                 return false;
             }
             scursor++;
             // /Almost parseAngleAddr
 
             maybeContentId.localPart = result;
             d->msgIdList.append(maybeContentId);
 
             eatCFWS(scursor, send, isCRLF);
             // header end ending the list: OK.
             if (scursor == send) {
                 return true;
             }
             // regular item separator: eat it.
             if (*scursor == ',') {
                 scursor++;
             }
         }
         return true;
     } else {
         return true;
     }
 }
 
 //-----</ContentID>----------------------
 
 //-----<ContentTransferEncoding>----------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(ContentTransferEncoding,
         Generics::Token, Content-Transfer-Encoding)
 //@endcond
 
 typedef struct {
     const char *s;
     int e;
 } encTableType;
 
 static const encTableType encTable[] = {
     { "7Bit", CE7Bit },
     { "8Bit", CE8Bit },
     { "quoted-printable", CEquPr },
     { "base64", CEbase64 },
     { "x-uuencode", CEuuenc },
     { "binary", CEbinary },
     { nullptr, 0}
 };
 
 void ContentTransferEncoding::clear() {
     Q_D(ContentTransferEncoding);
     d->decoded = true;
     d->cte = CE7Bit;
     Token::clear();
 }
 
 contentEncoding ContentTransferEncoding::encoding() const {
     return d_func()->cte;
 }
 
 void ContentTransferEncoding::setEncoding(contentEncoding e) {
     Q_D(ContentTransferEncoding);
     d->cte = e;
 
     for (int i = 0; encTable[i].s != nullptr; ++i) {
         if (d->cte == encTable[i].e) {
             setToken(encTable[i].s);
             break;
         }
     }
 }
 
 bool ContentTransferEncoding::isDecoded() const {
     return d_func()->decoded;
 }
 
 void ContentTransferEncoding::setDecoded(bool decoded) {
     Q_D(ContentTransferEncoding);
     d->decoded = decoded;
 }
 
 bool ContentTransferEncoding::needToEncode() const {
     const Q_D(ContentTransferEncoding);
     return d->decoded && (d->cte == CEquPr || d->cte == CEbase64);
 }
 
 bool ContentTransferEncoding::parse(const char  *&scursor,
                                     const char *const send, bool isCRLF) {
     Q_D(ContentTransferEncoding);
     clear();
     if (!Token::parse(scursor, send, isCRLF)) {
         return false;
     }
 
     // TODO: error handling in case of an unknown encoding?
     for (int i = 0; encTable[i].s != nullptr; ++i) {
         if (qstricmp(token().constData(), encTable[i].s) == 0) {
             d->cte = (contentEncoding)encTable[i].e;
             break;
         }
     }
     d->decoded = (d->cte == CE7Bit || d->cte == CE8Bit);
     return true;
 }
 
 //-----</ContentTransferEncoding>---------------------------
 
 //-----<ContentDisposition>--------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name_and_dptr(ContentDisposition,
         Generics::Parametrized, Content-Disposition)
 //@endcond
 
 QByteArray ContentDisposition::as7BitString(bool withHeaderType) const {
     if (isEmpty()) {
         return QByteArray();
     }
 
     QByteArray rv;
     if (withHeaderType) {
         rv += typeIntro();
     }
 
     if (d_func()->disposition == CDattachment) {
         rv += "attachment";
     } else if (d_func()->disposition == CDinline) {
         rv += "inline";
     } else {
         return QByteArray();
     }
 
     if (!Parametrized::isEmpty()) {
         rv += "; " + Parametrized::as7BitString(false);
     }
 
     return rv;
 }
 
 bool ContentDisposition::isEmpty() const {
     return d_func()->disposition == CDInvalid;
 }
 
 void ContentDisposition::clear() {
     Q_D(ContentDisposition);
     d->disposition = CDInvalid;
     Parametrized::clear();
 }
 
 contentDisposition ContentDisposition::disposition() const {
     return d_func()->disposition;
 }
 
 void ContentDisposition::setDisposition(contentDisposition disp) {
     Q_D(ContentDisposition);
     d->disposition = disp;
 }
 
 QString KMime::Headers::ContentDisposition::filename() const {
     return parameter(QStringLiteral("filename"));
 }
 
 void ContentDisposition::setFilename(const QString & filename) {
     setParameter(QStringLiteral("filename"), filename);
 }
 
 bool ContentDisposition::parse(const char  *&scursor, const char *const send,
                                 bool isCRLF) {
     Q_D(ContentDisposition);
     clear();
 
     // token
     QByteArray token;
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         return false;
     }
 
     QPair<const char *, int> maybeToken;
     if (!parseToken(scursor, send, maybeToken, ParseTokenNoFlag)) {
         return false;
     }
 
     token = QByteArray(maybeToken.first, maybeToken.second).toLower();
     if (token == "inline") {
         d->disposition = CDinline;
     } else if (token == "attachment") {
         d->disposition = CDattachment;
     } else {
         return false;
     }
 
     // parameter list
     eatCFWS(scursor, send, isCRLF);
     if (scursor == send) {
         return true; // no parameters
     }
 
     if (*scursor != ';') {
         return false;
     }
     scursor++;
 
     return Parametrized::parse(scursor, send, isCRLF);
 }
 
 //-----</ContentDisposition>-------------------------
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name(Subject, Generics::Unstructured, Subject)
 //@endcond
 
 Base *createHeader(const QByteArray & type) {
     return HeaderFactory::createHeader(type);
 }
 
 //@cond PRIVATE
 kmime_mk_trivial_ctor_with_name(ContentDescription,
                                 Generics::Unstructured, Content-Description)
 kmime_mk_trivial_ctor_with_name(ContentLocation,
                                 Generics::Unstructured, Content-Location)
 kmime_mk_trivial_ctor_with_name(From, Generics::MailboxList, From)
 kmime_mk_trivial_ctor_with_name(Sender, Generics::SingleMailbox, Sender)
 kmime_mk_trivial_ctor_with_name(To, Generics::AddressList, To)
 kmime_mk_trivial_ctor_with_name(Cc, Generics::AddressList, Cc)
 kmime_mk_trivial_ctor_with_name(Bcc, Generics::AddressList, Bcc)
 kmime_mk_trivial_ctor_with_name(ReplyTo, Generics::AddressList, Reply-To)
 kmime_mk_trivial_ctor_with_name(Keywords, Generics::PhraseList, Keywords)
 kmime_mk_trivial_ctor_with_name(MIMEVersion, Generics::DotAtom, MIME-Version)
 kmime_mk_trivial_ctor_with_name(Supersedes, Generics::SingleIdent, Supersedes)
 kmime_mk_trivial_ctor_with_name(InReplyTo, Generics::Ident, In-Reply-To)
 kmime_mk_trivial_ctor_with_name(References, Generics::Ident, References)
 kmime_mk_trivial_ctor_with_name(Organization, Generics::Unstructured, Organization)
 kmime_mk_trivial_ctor_with_name(UserAgent, Generics::Unstructured, User-Agent)
 //@endcond
 
 } // namespace Headers
 
 } // namespace KMime
diff --git a/src/kmime_headers.h b/src/kmime_headers.h
index 67ba60a..e0ba7bf 100644
--- a/src/kmime_headers.h
+++ b/src/kmime_headers.h
@@ -1,1464 +1,1464 @@
 /*  -*- c++ -*-
     kmime_headers.h
 
     KMime, the KDE Internet mail/usenet news message library.
     Copyright (c) 2001-2002 the KMime authors.
     See file AUTHORS for details
     Copyright (c) 2006 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.
 */
 /**
   @file
   This file is part of the API for handling @ref MIME data and
   defines the various header classes:
    - header's base class defining the common interface
    - generic base classes for different types of fields
    - incompatible, Structured-based field classes
    - compatible, Unstructured-based field classes
 
   @brief
   Defines the various headers classes.
 
   @authors the KMime authors (see AUTHORS file),
   Volker Krause \<vkrause@kde.org\>
 */
 
 #ifndef __KMIME_HEADERS_H__
 #define __KMIME_HEADERS_H__
 
 #include "kmime_export.h"
 #include "kmime_header_parsing.h"
 
 #include <QString>
 #include <QStringList>
 #include <QDateTime>
 #include <QMap>
 #include <QVector>
 #include <QByteArray>
 #include <QMetaType>
 
 namespace KMime
 {
 
 class Content;
 
 namespace Headers
 {
 
 class BasePrivate;
 
 enum contentCategory {
     CCsingle,
     CCcontainer,
     CCmixedPart,
     CCalternativePart
 };
 
 /**
   Various possible values for the "Content-Transfer-Encoding" header.
 */
 enum contentEncoding {
     CE7Bit,              ///< 7bit
     CE8Bit,              ///< 8bit
     CEquPr,              ///< quoted-printable
     CEbase64,            ///< base64
     CEuuenc,             ///< uuencode
     CEbinary             ///< binary
 };
 
 /**
   Various possible values for the "Content-Disposition" header.
 */
 enum contentDisposition {
     CDInvalid,           ///< Default, invalid value
     CDinline,            ///< inline
     CDattachment,        ///< attachment
     CDparallel           ///< parallel (invalid, do not use)
 };
 
 //@cond PRIVATE
 // internal macro to generate default constructors
 #define kmime_mk_trivial_ctor( subclass )                               \
     public:                                                               \
     subclass();                           \
     ~subclass();
 
 #define kmime_mk_dptr_ctor( subclass ) \
     protected: \
     explicit subclass( subclass##Private *d );
 
 #define kmime_mk_trivial_ctor_with_name( subclass )     \
     kmime_mk_trivial_ctor( subclass )                     \
     const char *type() const override;                           \
     static const char *staticType();
 //@endcond
 
 //
 //
 // HEADER'S BASE CLASS. DEFINES THE COMMON INTERFACE
 //
 //
 
 /** Baseclass of all header-classes. It represents a
     header-field as described in RFC-822.  */
 class KMIME_EXPORT Base
 {
 public:
     /**
       A vector of headers.
     */
     typedef QVector<KMime::Headers::Base *> List;
 
     /**
       Creates an empty header.
     */
     Base();
 
     /**
       Destructor.
     */
     virtual ~Base();
 
     /**
       Parses the given string. Take care of RFC2047-encoded strings.
       @param s The encoded header data.
     */
     virtual void from7BitString(const char *s, size_t len);
     virtual void from7BitString(const QByteArray &s) = 0;
 
     /**
       Returns the encoded header.
       @param withHeaderType Specifies whether the header-type should be included.
     */
     virtual QByteArray as7BitString(bool withHeaderType = true) const = 0;
 
     /**
       Returns the charset that is used for RFC2047-encoding.
     */
     QByteArray rfc2047Charset() const;
 
     /**
       Sets the charset for RFC2047-encoding.
       @param cs The new charset used for RFC2047 encoding.
     */
     void setRFC2047Charset(const QByteArray &cs);
 
     /**
       Parses the given string and set the charset.
       @param s The header data as unicode string.
       @param b The charset preferred for encoding.
     */
     virtual void fromUnicodeString(const QString &s, const QByteArray &b) = 0;
 
     /**
       Returns the decoded content of the header without the header-type.
 
       @note The return value of this method should only be used when showing an address
             to the user. It is not guaranteed that fromUnicodeString( asUnicodeString(), ... )
             will return the original string.
     */
     virtual QString asUnicodeString() const = 0;
 
     /**
       Deletes.
     */
     virtual void clear() = 0;
 
     /**
       Checks if this header contains any data.
     */
     virtual bool isEmpty() const = 0;
 
     /**
       Returns the type of this header (e.g. "From").
     */
     virtual const char *type() const;
 
     /**
       Checks if this header is of type @p t.
     */
     bool is(const char *t) const;
 
     /**
       Checks if this header is a MIME header.
     */
     bool isMimeHeader() const;
 
 protected:
     /**
       Helper method, returns the header prefix including ":".
     */
     QByteArray typeIntro() const;
 
     //@cond PRIVATE
     BasePrivate *d_ptr;
     kmime_mk_dptr_ctor(Base)
     //@endcond
 
 private:
     Q_DECLARE_PRIVATE(Base)
     Q_DISABLE_COPY(Base)
 };
 
 //
 //
 // GENERIC BASE CLASSES FOR DIFFERENT TYPES OF FIELDS
 //
 //
 
 namespace Generics
 {
 
 class UnstructuredPrivate;
 
 /**
   Abstract base class for unstructured header fields
   (e.g. "Subject", "Comment", "Content-description").
 
   Features: Decodes the header according to RFC2047, incl. RFC2231
   extensions to encoded-words.
 
   Subclasses need only re-implement @p const @p char* @p type().
 */
 
 // known issues:
 // - uses old decodeRFC2047String function, instead of our own...
 
 class KMIME_EXPORT Unstructured : public Base
 {
     //@cond PRIVATE
     kmime_mk_dptr_ctor(Unstructured)
     //@endcond
 public:
     Unstructured();
     ~Unstructured();
 
     using Base::from7BitString;
     void from7BitString(const QByteArray &s) override;
     QByteArray as7BitString(bool withHeaderType = true) const override;
 
     void fromUnicodeString(const QString &s, const QByteArray &b) override;
     QString asUnicodeString() const override;
 
     void clear() override;
 
     bool isEmpty() const override;
 
 private:
     Q_DECLARE_PRIVATE(Unstructured)
 };
 
 class StructuredPrivate;
 
 /**
   @brief
   Base class for structured header fields.
 
   This is the base class for all structured header fields.
   It contains parsing methods for all basic token types found in rfc2822.
 
   @section Parsing
 
   At the basic level, there are tokens & tspecials (rfc2045),
   atoms & specials, quoted-strings, domain-literals (all rfc822) and
   encoded-words (rfc2047).
 
   As a special token, we have the comment. It is one of the basic
   tokens defined in rfc822, but it's parsing relies in part on the
   basic token parsers (e.g. comments may contain encoded-words).
   Also, most upper-level parsers (notably those for phrase and
   dot-atom) choose to ignore any comment when parsing.
 
   Then there are the real composite tokens, which are made up of one
   or more of the basic tokens (and semantically invisible comments):
   phrases (rfc822 with rfc2047) and dot-atoms (rfc2822).
 
   This finishes the list of supported token types. Subclasses will
   provide support for more higher-level tokens, where necessary,
   using these parsers.
 
   @author Marc Mutz <mutz@kde.org>
 */
 
 class KMIME_EXPORT Structured : public Base
 {
 public:
     Structured();
     ~Structured();
 
     void from7BitString(const char *s, size_t len) override;
     void from7BitString(const QByteArray &s) override;
     QString asUnicodeString() const override;
     void fromUnicodeString(const QString &s, const QByteArray &b) override;
 
 protected:
     /**
       This method parses the raw header and needs to be implemented in
       every sub-class.
 
       @param scursor Pointer to the start of the data still to parse.
       @param send Pointer to the end of the data.
       @param isCRLF true if input string is terminated with a CRLF.
     */
     virtual bool parse(const char *&scursor, const char *const send,
                        bool isCRLF = false) = 0;
 
     //@cond PRIVATE
     kmime_mk_dptr_ctor(Structured)
     //@endcond
 
 private:
     Q_DECLARE_PRIVATE(Structured)
 };
 
 class AddressPrivate;
 
 /**
   Base class for all address related headers.
 */
 class KMIME_EXPORT Address : public Structured
 {
 public:
     Address();
     ~Address();
 protected:
     //@cond PRIVATE
     kmime_mk_dptr_ctor(Address)
     //@endcond
 private:
     Q_DECLARE_PRIVATE(Address)
 };
 
 class MailboxListPrivate;
 
 /**
   Base class for headers that deal with (possibly multiple)
   addresses, but don't allow groups.
 
   @see RFC 2822, section 3.4
 */
 class KMIME_EXPORT MailboxList : public Address
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(MailboxList)
     kmime_mk_dptr_ctor(MailboxList)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void fromUnicodeString(const QString &s, const QByteArray &b) override;
     QString asUnicodeString() const override;
 
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Adds an address to this header.
 
       @param mbox A Mailbox object specifying the address.
     */
     void addAddress(const Types::Mailbox &mbox);
 
     /**
       Adds an address to this header.
       @param address The actual email address, with or without angle brackets.
       @param displayName An optional name associated with the address.
     */
     void addAddress(const QByteArray &address,
                     const QString &displayName = QString());
 
     /**
       Returns a list of all addresses in this header, regardless of groups.
     */
     QVector<QByteArray> addresses() const;
 
     /**
       Returns a list of all display names associated with the addresses in
       this header. The address is added for addresses that do not have
       a display name.
     */
     QStringList displayNames() const;
 
     /**
       Returns a single string for user-facing display of this mailbox list.
       This is equivalent to displayNames().join(", ").
       @since 5.14
     */
     QString displayString() const;
 
     /**
       Returns a list of mailboxes listed in this header.
     */
     Types::Mailbox::List mailboxes() const;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(MailboxList)
 };
 
 class SingleMailboxPrivate;
 
 /**
    Base class for headers that deal with exactly one mailbox
    (e.g. Sender).
 */
 class KMIME_EXPORT SingleMailbox : public MailboxList
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(SingleMailbox)
     //@endcond
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 private:
     Q_DECLARE_PRIVATE(SingleMailbox)
 };
 
 class AddressListPrivate;
 
 /**
   Base class for headers that deal with (possibly multiple)
   addresses, allowing groups.
 
   Note: Groups are parsed but not represented in the API yet. All addresses in
   groups are listed as if they would not be part of a group.
 
   @todo Add API for groups?
 
   @see RFC 2822, section 3.4
 */
 class KMIME_EXPORT AddressList : public Address
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(AddressList)
     kmime_mk_dptr_ctor(AddressList)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void fromUnicodeString(const QString &s, const QByteArray &b) override;
     QString asUnicodeString() const override;
 
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Adds an address to this header.
 
       @param mbox A Mailbox object specifying the address.
     */
     void addAddress(const Types::Mailbox &mbox);
 
     /**
       Adds an address to this header.
       @param address The actual email address, with or without angle brackets.
       @param displayName An optional name associated with the address.
     */
     void addAddress(const QByteArray &address, const QString &displayName = QString());
 
     /**
       Returns a list of all addresses in this header, regardless of groups.
     */
     QVector<QByteArray> addresses() const;
 
     /**
       Returns a list of all display names associated with the addresses in this header.
       The address is added for addresses that don't have a display name.
     */
     QStringList displayNames() const;
 
     /**
       Returns a single string for user-facing display of this address list.
       This is equivalent to displayNames().join(", ").
       @since 5.14
     */
     QString displayString() const;
 
     /**
       Returns a list of mailboxes listed in this header.
     */
     Types::Mailbox::List mailboxes() const;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(AddressList)
 };
 
 class IdentPrivate;
 
 /**
   Base class for headers which deal with a list of msg-id's.
 
   @see RFC 2822, section 3.6.4
 */
 class KMIME_EXPORT Ident : public Address
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(Ident)
     kmime_mk_dptr_ctor(Ident)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Initialize this identifier Copy the data from
      */
     void fromIdent(const Ident* ident);
 
     /**
       Returns the list of identifiers contained in this header.
       Note:
       - Identifiers are not enclosed in angle-brackets.
       - Identifiers are listed in the same order as in the header.
     */
     QVector<QByteArray> identifiers() const;
 
     /**
       Appends a new identifier to this header.
       @param id The identifier to append, with or without angle-brackets.
     */
     void appendIdentifier(const QByteArray &id);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Ident)
 };
 
 class SingleIdentPrivate;
 
 /**
   Base class for headers which deal with a single msg-id.
 
   @see RFC 2822, section 3.6.4
 */
 class KMIME_EXPORT SingleIdent : public Ident
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(SingleIdent)
     kmime_mk_dptr_ctor(SingleIdent)
     //@endcond
 public:
     /**
       Returns the identifier contained in this header.
       Note: The identifiers is not enclosed in angle-brackets.
     */
     QByteArray identifier() const;
 
     /**
       Sets the identifier.
       @param id The new identifier with or without angle-brackets.
     */
     void setIdentifier(const QByteArray &id);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(SingleIdent)
 };
 
 class TokenPrivate;
 
 /**
   Base class for headers which deal with a single atom.
 */
 class KMIME_EXPORT Token : public Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(Token)
     kmime_mk_dptr_ctor(Token)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the token.
     */
     QByteArray token() const;
 
     /**
       Sets the token to @p t,
     */
     void setToken(const QByteArray &t);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Token)
 };
 
 class PhraseListPrivate;
 
 /**
   Base class for headers containing a list of phrases.
 */
 class KMIME_EXPORT PhraseList : public Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(PhraseList)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     QString asUnicodeString() const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the list of phrases contained in this header.
     */
     QStringList phrases() const;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(PhraseList)
 };
 
 class DotAtomPrivate;
 
 /**
   Base class for headers containing a dot atom.
 */
 class KMIME_EXPORT DotAtom : public Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(DotAtom)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     QString asUnicodeString() const override;
     void clear() override;
     bool isEmpty() const override;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(DotAtom)
 };
 
 class ParametrizedPrivate;
 
 /**
   Base class for headers containing a parameter list such as "Content-Type".
 */
 class KMIME_EXPORT Parametrized : public Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor(Parametrized)
     kmime_mk_dptr_ctor(Parametrized)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
 
     bool isEmpty() const override;
     void clear() override;
 
     //FIXME: Shouldn't the parameter keys be QByteArray and not QStrings? Only the values can be
     //       non-ascii!
 
     /**
       Returns the value of the specified parameter.
       @param key The parameter name.
     */
     QString parameter(const QString &key) const;
 
     /**
       @param key the key of the parameter to check for
       @return true if a parameter with the given @p key exists.
       @since 4.5
     */
     bool hasParameter(const QString &key) const;
 
     /**
       Sets the parameter @p key to @p value.
       @param key The parameter name.
       @param value The new value for @p key.
     */
     void setParameter(const QString &key, const QString &value);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Parametrized)
 };
 
 } // namespace Generics
 
 //
 //
 // INCOMPATIBLE, GSTRUCTURED-BASED FIELDS:
 //
 //
 
 class ReturnPathPrivate;
 
 /**
   Represents the Return-Path header field.
 
   @see RFC 2822, section 3.6.7
 */
 class KMIME_EXPORT ReturnPath : public Generics::Address
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(ReturnPath)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void clear() override;
     bool isEmpty() const override;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(ReturnPath)
 };
 
 // Address et al.:
 
 // rfc(2)822 headers:
 /**
    Represent a "From" header.
 
    @see RFC 2822, section 3.6.2.
 */
 class KMIME_EXPORT From : public Generics::MailboxList
 {
     kmime_mk_trivial_ctor_with_name(From)
 };
 
 /**
   Represents a "Sender" header.
 
   @see RFC 2822, section 3.6.2.
 */
 class KMIME_EXPORT Sender : public Generics::SingleMailbox
 {
     kmime_mk_trivial_ctor_with_name(Sender)
 };
 
 /**
   Represents a "To" header.
 
   @see RFC 2822, section 3.6.3.
 */
 class KMIME_EXPORT To : public Generics::AddressList
 {
     kmime_mk_trivial_ctor_with_name(To)
 };
 
 /**
   Represents a "Cc" header.
 
   @see RFC 2822, section 3.6.3.
 */
 class KMIME_EXPORT Cc : public Generics::AddressList
 {
     kmime_mk_trivial_ctor_with_name(Cc)
 };
 
 /**
   Represents a "Bcc" header.
 
   @see RFC 2822, section 3.6.3.
 */
 class KMIME_EXPORT Bcc : public Generics::AddressList
 {
     kmime_mk_trivial_ctor_with_name(Bcc)
 };
 
 /**
   Represents a "ReplyTo" header.
 
   @see RFC 2822, section 3.6.2.
 */
 class KMIME_EXPORT ReplyTo : public Generics::AddressList
 {
     kmime_mk_trivial_ctor_with_name(ReplyTo)
 };
 
 class MailCopiesToPrivate;
 
 /**
   Represents a "Mail-Copies-To" header.
 
   @see http://www.newsreaders.com/misc/mail-copies-to.html
 */
 class KMIME_EXPORT MailCopiesTo : public Generics::AddressList
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(MailCopiesTo)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     QString asUnicodeString() const override;
 
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns true if a mail copy was explicitly requested.
     */
     bool alwaysCopy() const;
 
     /**
       Sets the header to "poster".
     */
     void setAlwaysCopy();
 
     /**
       Returns true if a mail copy was explicitly denied.
     */
     bool neverCopy() const;
 
     /**
       Sets the header to "never".
     */
     void setNeverCopy();
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(MailCopiesTo)
 };
 
 class ContentTransferEncodingPrivate;
 
 /**
   Represents a "Content-Transfer-Encoding" header.
 
   @see RFC 2045, section 6.
 */
 class KMIME_EXPORT ContentTransferEncoding : public Generics::Token
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(ContentTransferEncoding)
     //@endcond
 public:
     void clear() override;
 
     /**
       Returns the encoding specified in this header.
     */
     contentEncoding encoding() const;
 
     /**
       Sets the encoding to @p e.
     */
     void setEncoding(contentEncoding e);
 
     /**
       Returns whether the Content containing this header is already decoded.
     */
     bool isDecoded() const;
 
     /**
       Set whether the Content containing this header is already decoded.
       For instance, if you fill your Content with already-encoded base64 data,
       you will want to setDecoded( false ).
       @param decoded if @c true the content is already decoded
     */
     void setDecoded(bool isDecoded = true);
 
     /**
       Returns whether the Content containing this header needs to be encoded
       (i.e., if decoded() is true and encoding() is base64 or quoted-printable).
     */
     bool needToEncode() const;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(ContentTransferEncoding)
 };
 
 /**
   Represents a "Keywords" header.
 
   @see RFC 2822, section 3.6.5.
 */
 class KMIME_EXPORT Keywords : public Generics::PhraseList
 {
     kmime_mk_trivial_ctor_with_name(Keywords)
 };
 
 // DotAtom:
 
 /**
   Represents a "MIME-Version" header.
 
   @see RFC 2045, section 4.
 */
 class KMIME_EXPORT MIMEVersion : public Generics::DotAtom
 {
     kmime_mk_trivial_ctor_with_name(MIMEVersion)
 };
 
 // Ident:
 
 /**
   Represents a "Message-ID" header.
 
   @see RFC 2822, section 3.6.4.
 */
 class KMIME_EXPORT MessageID : public Generics::SingleIdent
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(MessageID)
     //@endcond
 public:
     /**
       Generate a message identifer.
       @param fqdn A fully qualified domain name.
     */
     void generate(const QByteArray &fqdn);
 };
 
 class ContentIDPrivate;
 
 /**
   Represents a "Content-ID" header.
 */
 class KMIME_EXPORT ContentID : public Generics::SingleIdent
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(ContentID)
     kmime_mk_dptr_ctor(ContentID)
     //@endcond
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 private:
     Q_DECLARE_PRIVATE(ContentID)
 };
 
 /**
   Represents a "Supersedes" header.
 */
 class KMIME_EXPORT Supersedes : public Generics::SingleIdent
 {
     kmime_mk_trivial_ctor_with_name(Supersedes)
 };
 
 /**
   Represents a "In-Reply-To" header.
 
   @see RFC 2822, section 3.6.4.
 */
 class KMIME_EXPORT InReplyTo : public Generics::Ident
 {
     kmime_mk_trivial_ctor_with_name(InReplyTo)
 };
 
 /**
   Represents a "References" header.
 
   @see RFC 2822, section 3.6.4.
 */
 class KMIME_EXPORT References : public Generics::Ident
 {
     kmime_mk_trivial_ctor_with_name(References)
 };
 
 class ContentTypePrivate;
 
 /**
   Represents a "Content-Type" header.
 
   @see RFC 2045, section 5.
 */
 class KMIME_EXPORT ContentType : public Generics::Parametrized
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(ContentType)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the mimetype.
     */
     QByteArray mimeType() const;
 
     /**
       Returns the media type (first part of the mimetype).
     */
 
     QByteArray mediaType() const;
 
     /**
       Returns the mime sub-type (second part of the mimetype).
     */
     QByteArray subType() const;
 
     /**
-      Sets the mimetype and clears already existing parameters.
+      Sets the mimetype.
       @param mimeType The new mimetype.
     */
     void setMimeType(const QByteArray &mimeType);
 
     /**
       Tests if the media type equals @p mediatype.
     */
     bool isMediatype(const char *mediatype) const;
 
     /**
       Tests if the mime sub-type equals @p subtype.
     */
     bool isSubtype(const char *subtype) const;
 
     /**
       Tests if the mime type is @p mimeType.
     */
     bool isMimeType(const char *mimeType) const;
 
     /**
       Returns true if the associated MIME entity is a text.
     */
     bool isText() const;
 
     /**
       Returns true if the associated MIME entity is a plain text.
     */
     bool isPlainText() const;
 
     /**
       Returns true if the associated MIME entity is a HTML file.
     */
     bool isHTMLText() const;
 
     /**
       Returns true if the associated MIME entity is an image.
     */
     bool isImage() const;
 
     /**
       Returns true if the associated MIME entity is a mulitpart container.
     */
     bool isMultipart() const;
 
     /**
       Returns true if the associated MIME entity contains partial data.
       @see partialNumber(), partialCount()
     */
     bool isPartial() const;
 
     /**
       Returns the charset for the associated MIME entity.
     */
     QByteArray charset() const;
 
     /**
       Sets the charset.
     */
     void setCharset(const QByteArray &s);
 
     /**
       Returns the boundary (for mulitpart containers).
     */
     QByteArray boundary() const;
 
     /**
       Sets the mulitpart container boundary.
     */
     void setBoundary(const QByteArray &s);
 
     /**
       Returns the name of the associated MIME entity.
     */
     QString name() const;
 
     /**
       Sets the name to @p s using charset @p cs.
     */
     void setName(const QString &s, const QByteArray &cs);
 
     /**
       Returns the identifier of the associated MIME entity.
     */
     QByteArray id() const;
 
     /**
       Sets the identifier.
     */
     void setId(const QByteArray &s);
 
     /**
       Returns the position of this part in a multi-part set.
       @see isPartial(), partialCount()
     */
     int partialNumber() const;
 
     /**
       Returns the total number of parts in a multi-part set.
       @see isPartial(), partialNumber()
     */
     int partialCount() const;
 
     /**
       Sets parameters of a partial MIME entity.
       @param total The total number of entities in the multi-part set.
       @param number The number of this entity in a multi-part set.
     */
     void setPartialParams(int total, int number);
 
     // TODO: document
     contentCategory category() const;
 
     void setCategory(contentCategory c);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(ContentType)
 };
 
 class ContentDispositionPrivate;
 
 /**
   Represents a "Content-Disposition" header.
 
   @see RFC 2183
 */
 class KMIME_EXPORT ContentDisposition : public Generics::Parametrized
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(ContentDisposition)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     bool isEmpty() const override;
     void clear() override;
 
     /**
       Returns the content disposition.
     */
     contentDisposition disposition() const;
 
     /**
       Sets the content disposition.
       @param disp The new content disposition.
     */
     void setDisposition(contentDisposition disp);
 
     /**
       Returns the suggested filename for the associated MIME part.
       This is just a convenience function, it is equivalent to calling
       parameter( "filename" );
     */
     QString filename() const;
 
     /**
       Sets the suggested filename for the associated MIME part.
       This is just a convenience function, it is equivalent to calling
       setParameter( "filename", filename );
       @param filename The filename.
     */
     void setFilename(const QString &filename);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(ContentDisposition)
 };
 
 //
 //
 // COMPATIBLE GUNSTRUCTURED-BASED FIELDS:
 //
 //
 
 class GenericPrivate;
 
 /**
   Represents an arbitrary header, that can contain any header-field.
   Adds a type over Unstructured.
   @see Unstructured
 */
 class KMIME_EXPORT Generic : public Generics::Unstructured
 {
 public:
     Generic();
     Generic(const char *t, int len = -1);
     ~Generic();
 
     void clear() override;
 
     bool isEmpty() const override;
 
     const char *type() const override;
 
     void setType(const char *type, int len = -1);
 
 private:
     Q_DECLARE_PRIVATE(Generic)
 };
 
 /**
   Represents a "Subject" header.
 
   @see RFC 2822, section 3.6.5.
 */
 class KMIME_EXPORT Subject : public Generics::Unstructured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(Subject)
     //@endcond
 };
 
 /**
   Represents a "Organization" header.
 */
 class KMIME_EXPORT Organization : public Generics::Unstructured
 {
     kmime_mk_trivial_ctor_with_name(Organization)
 };
 
 /**
   Represents a "Content-Description" header.
 */
 class KMIME_EXPORT ContentDescription : public Generics::Unstructured
 {
     kmime_mk_trivial_ctor_with_name(ContentDescription)
 };
 
 /**
   Represents a "Content-Location" header.
   @since 4.2
 */
 class KMIME_EXPORT ContentLocation : public Generics::Unstructured
 {
     kmime_mk_trivial_ctor_with_name(ContentLocation)
 };
 
 class ControlPrivate;
 
 /**
   Represents a "Control" header.
 
   @see RFC 1036, section 3.
 */
 class KMIME_EXPORT Control : public Generics::Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(Control)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the control message type.
     */
     QByteArray controlType() const;
 
     /**
       Returns the control message parameter.
     */
     QByteArray parameter() const;
 
     /**
       Returns true if this is a cancel control message.
       @see RFC 1036, section 3.1.
     */
     bool isCancel() const;
 
     /**
       Changes this header into a cancel control message for the given message-id.
       @param msgid The message-id of the article that should be canceled.
     */
     void setCancel(const QByteArray &msgid);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Control)
 };
 
 class DatePrivate;
 
 /**
   Represents a "Date" header.
 
   @see RFC 2822, section 3.3.
 */
 class KMIME_EXPORT Date : public Generics::Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(Date)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the date contained in this header.
     */
     QDateTime dateTime() const;
 
     /**
       Sets the date.
     */
     void setDateTime(const QDateTime &dt);
 
     /**
       Returns the age of the message.
     */
     int ageInDays() const;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Date)
 };
 
 class NewsgroupsPrivate;
 
 /**
   Represents a "Newsgroups" header.
 
   @see RFC 1036, section 2.1.3.
 */
 class KMIME_EXPORT Newsgroups : public Generics::Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(Newsgroups)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     void fromUnicodeString(const QString &s, const QByteArray &b) override;
     QString asUnicodeString() const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the list of newsgroups.
     */
     QVector<QByteArray> groups() const;
 
     /**
       Sets the newsgroup list.
     */
     void setGroups(const QVector<QByteArray> &groups);
 
     /**
       Returns true if this message has been cross-posted, i.e. if it has been
       posted to multiple groups.
     */
     bool isCrossposted() const;
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Newsgroups)
 };
 
 /**
   Represents a "Followup-To" header.
 
   @see RFC 1036, section 2.2.3.
 */
 class KMIME_EXPORT FollowUpTo : public Newsgroups
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(FollowUpTo)
     //@endcond
 };
 
 class LinesPrivate;
 
 /**
   Represents a "Lines" header.
 
   @see RFC 1036, section 2.2.12.
 */
 class KMIME_EXPORT Lines : public Generics::Structured
 {
     //@cond PRIVATE
     kmime_mk_trivial_ctor_with_name(Lines)
     //@endcond
 public:
     QByteArray as7BitString(bool withHeaderType = true) const override;
     QString asUnicodeString() const override;
     void clear() override;
     bool isEmpty() const override;
 
     /**
       Returns the number of lines, undefined if isEmpty() returns true.
     */
     int numberOfLines() const;
 
     /**
       Sets the number of lines to @p lines.
     */
     void setNumberOfLines(int lines);
 
 protected:
     bool parse(const char *&scursor, const char *const send, bool isCRLF = false) override;
 
 private:
     Q_DECLARE_PRIVATE(Lines)
 };
 
 /**
   Represents a "User-Agent" header.
 */
 class KMIME_EXPORT UserAgent : public Generics::Unstructured
 {
     kmime_mk_trivial_ctor_with_name(UserAgent)
 };
 
 /** Creates a header based on @param type. If @param type is a known header type,
  * the right object type will be created, otherwise a null pointer is returned. */
 KMIME_EXPORT Base *createHeader(const QByteArray &type);
 
 }  //namespace Headers
 
 }  //namespace KMime
 
 // undefine code generation macros again
 #undef kmime_mk_trivial_ctor
 #undef kmime_mk_dptr_ctor
 #undef kmime_mk_trivial_ctor_with_name
 
 Q_DECLARE_METATYPE(KMime::Headers::To*)
 Q_DECLARE_METATYPE(KMime::Headers::Cc*)
 Q_DECLARE_METATYPE(KMime::Headers::Bcc*)
 
 #endif // __KMIME_HEADERS_H__