diff --git a/lang/qt/src/protocol_p.h b/lang/qt/src/protocol_p.h
index 9ff62ee6..56c296c0 100644
--- a/lang/qt/src/protocol_p.h
+++ b/lang/qt/src/protocol_p.h
@@ -1,504 +1,504 @@
 /*
     protocol_p.h
 
     This file is part of qgpgme, the Qt API binding for gpgme
     Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
     Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
     Software engineering by Intevation GmbH
     Copyright (c) 2022 by g10 Code GmbH
     Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
 
     QGpgME is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.
 
     QGpgME is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
     the Qt library by Trolltech AS, Norway (or with modified versions
     of Qt that use the same license as Qt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
     Qt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 #ifndef __QGPGME_PROTOCOL_P_H__
 #define __QGPGME_PROTOCOL_P_H__
 #include "qgpgmenewcryptoconfig.h"
 
 #include "qgpgmekeygenerationjob.h"
 #include "qgpgmekeylistjob.h"
 #include "qgpgmelistallkeysjob.h"
 #include "qgpgmedecryptjob.h"
 #include "qgpgmedecryptverifyjob.h"
 #include "qgpgmerefreshopenpgpkeysjob.h"
 #include "qgpgmerefreshsmimekeysjob.h"
 #include "qgpgmedeletejob.h"
 #include "qgpgmedownloadjob.h"
 #include "qgpgmesignencryptjob.h"
 #include "qgpgmeencryptjob.h"
 #include "qgpgmesignjob.h"
 #include "qgpgmesignkeyjob.h"
 #include "qgpgmeexportjob.h"
 #include "qgpgmeverifydetachedjob.h"
 #include "qgpgmeimportjob.h"
 #include "qgpgmeimportfromkeyserverjob.h"
 #include "qgpgmeverifyopaquejob.h"
 #include "qgpgmechangeexpiryjob.h"
 #include "qgpgmechangeownertrustjob.h"
 #include "qgpgmechangepasswdjob.h"
 #include "qgpgmeaddexistingsubkeyjob.h"
 #include "qgpgmeadduseridjob.h"
 #include "qgpgmekeyformailboxjob.h"
 #include "qgpgmewkdlookupjob.h"
 #include "qgpgmewkspublishjob.h"
 #include "qgpgmetofupolicyjob.h"
 #include "qgpgmequickjob.h"
 #include "qgpgmereceivekeysjob.h"
 #include "qgpgmerevokekeyjob.h"
 
 namespace
 {
 
 class Protocol : public QGpgME::Protocol
 {
     GpgME::Protocol mProtocol;
 public:
     explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {}
 
     QString name() const Q_DECL_OVERRIDE
     {
         switch (mProtocol) {
         case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
         case GpgME::CMS:     return QStringLiteral("SMIME");
         default:             return QString();
         }
     }
 
     QString displayName() const Q_DECL_OVERRIDE
     {
         // ah (2.4.16): Where is this used and isn't this inverted
         // with name
         switch (mProtocol) {
         case GpgME::OpenPGP: return QStringLiteral("gpg");
         case GpgME::CMS:     return QStringLiteral("gpgsm");
         default:             return QStringLiteral("unknown");
         }
     }
 
     QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const Q_DECL_OVERRIDE
     {
         return nullptr;
     }
 
     QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         unsigned int mode = context->keyListMode();
         if (remote) {
             mode |= GpgME::Extern;
             mode &= ~GpgME::Local;
         } else {
             mode |= GpgME::Local;
             mode &= ~GpgME::Extern;
         }
         if (includeSigs) {
             mode |= GpgME::Signatures;
         }
         if (validate) {
             mode |= GpgME::Validate;
         }
         context->setKeyListMode(mode);
         return new QGpgME::QGpgMEKeyListJob(context);
     }
 
     QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         unsigned int mode = context->keyListMode();
         mode |= GpgME::Local;
         mode &= ~GpgME::Extern;
         if (includeSigs) {
             mode |= GpgME::Signatures;
         }
         if (validate) {
             mode |= GpgME::Validate;
             /* Setting the context to offline mode disables CRL / OCSP checks in
                this Job. Otherwise we would try to fetch the CRL's for all CMS
                keys in the users keyring because GpgME::Validate includes remote
                resources by default in the validity check.
                This setting only has any effect if gpgsm >= 2.1.6 is used.
                */
             context->setOffline(true);
         }
         context->setKeyListMode(mode);
         return new QGpgME::QGpgMEListAllKeysJob(context);
     }
 
     QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         context->setTextMode(textmode);
         return new QGpgME::QGpgMEEncryptJob(context);
     }
 
     QGpgME::DecryptJob *decryptJob() const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEDecryptJob(context);
     }
 
     QGpgME::SignJob *signJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         context->setTextMode(textMode);
         return new QGpgME::QGpgMESignJob(context);
     }
 
     QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setTextMode(textMode);
         return new QGpgME::QGpgMEVerifyDetachedJob(context);
     }
 
     QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setTextMode(textMode);
         return new QGpgME::QGpgMEVerifyOpaqueJob(context);
     }
 
     QGpgME::KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEKeyGenerationJob(context);
     }
 
     QGpgME::ImportJob *importJob() const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEImportJob(context);
     }
 
     QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEImportFromKeyserverJob(context);
     }
 
     QGpgME::ReceiveKeysJob *receiveKeysJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEReceiveKeysJob{context};
     }
 
     QGpgME::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         return new QGpgME::QGpgMEExportJob(context);
     }
 
     QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecret);
     }
 
     QGpgME::ExportJob *secretSubkeyExportJob(bool armor) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecretSubkey);
     }
 
     QGpgME::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol == GpgME::CMS) {
             return new QGpgME::QGpgMERefreshSMIMEKeysJob;
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMERefreshOpenPGPKeysJob{context};
     }
 
     QGpgME::DownloadJob *downloadJob(bool armor) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         // this is the hackish interface for downloading from keyserers currently:
         context->setKeyListMode(GpgME::Extern);
         return new QGpgME::QGpgMEDownloadJob(context);
     }
 
     QGpgME::DeleteJob *deleteJob() const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEDeleteJob(context);
     }
 
     QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setArmor(armor);
         context->setTextMode(textMode);
         return new QGpgME::QGpgMESignEncryptJob(context);
     }
 
     QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
 
         context->setTextMode(textMode);
         return new QGpgME::QGpgMEDecryptVerifyJob(context);
     }
 
     QGpgME::ChangeExpiryJob *changeExpiryJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEChangeExpiryJob(context);
     }
 
     QGpgME::ChangePasswdJob *changePasswdJob() const Q_DECL_OVERRIDE
     {
         if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) {
             return nullptr;
         }
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEChangePasswdJob(context);
     }
 
     QGpgME::SignKeyJob *signKeyJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMESignKeyJob(context);
     }
 
     QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEChangeOwnerTrustJob(context);
     }
 
     QGpgME:: AddExistingSubkeyJob *addExistingSubkeyJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEAddExistingSubkeyJob{context};
     }
 
     QGpgME::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
         }
 
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEAddUserIDJob(context);
     }
 
     QGpgME::KeyListJob *locateKeysJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
-        context->setKeyListMode(GpgME::Extern | GpgME::Local | GpgME::Signatures | GpgME::Validate);
+        context->setKeyListMode(GpgME::Locate | GpgME::Signatures | GpgME::Validate);
         return new QGpgME::QGpgMEKeyListJob(context);
     }
 
     QGpgME::KeyForMailboxJob *keyForMailboxJob() const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEKeyForMailboxJob(context);
     }
 
     QGpgME::WKDLookupJob *wkdLookupJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
         auto context = GpgME::Context::createForEngine(GpgME::AssuanEngine);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEWKDLookupJob(context.release());
     }
 
     QGpgME::WKSPublishJob *wksPublishJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
         auto context = GpgME::Context::createForEngine(GpgME::SpawnEngine);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEWKSPublishJob(context.release());
     }
 
     QGpgME::TofuPolicyJob *tofuPolicyJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMETofuPolicyJob(context);
     }
 
     QGpgME::QuickJob *quickJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMEQuickJob(context);
     }
 
     QGpgME::RevokeKeyJob *revokeKeyJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
         }
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
             return nullptr;
         }
         return new QGpgME::QGpgMERevokeKeyJob(context);
     }
 };
 
 }
 #endif
diff --git a/lang/qt/src/qgpgmekeyformailboxjob.cpp b/lang/qt/src/qgpgmekeyformailboxjob.cpp
index 534e9a36..b6ab3db6 100644
--- a/lang/qt/src/qgpgmekeyformailboxjob.cpp
+++ b/lang/qt/src/qgpgmekeyformailboxjob.cpp
@@ -1,143 +1,143 @@
 /*
     qgpgmekeyformailboxjob.cpp
 
     This file is part of qgpgme, the Qt API binding for gpgme
     Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
     Software engineering by Intevation GmbH
 
     QGpgME is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.
 
     QGpgME is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
     the Qt library by Trolltech AS, Norway (or with modified versions
     of Qt that use the same license as Qt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
     Qt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
 #ifdef HAVE_CONFIG_H
  #include "config.h"
 #endif
 
 #include "qgpgmekeyformailboxjob.h"
 #include "qgpgmekeylistjob.h"
 
 #include <QStringList>
 
 #include <tuple>
 
 using namespace GpgME;
 using namespace QGpgME;
 
 QGpgMEKeyForMailboxJob::QGpgMEKeyForMailboxJob(Context *context)
     : mixin_type(context)
 {
     lateInitialization();
 }
 
 QGpgMEKeyForMailboxJob::~QGpgMEKeyForMailboxJob() {}
 
 static bool keyIsOk(const Key k)
 {
     return !k.isExpired() && !k.isRevoked() && !k.isInvalid() && !k.isDisabled();
 }
 
 static bool uidIsOk(const UserID uid)
 {
     return keyIsOk(uid.parent()) && !uid.isRevoked() && !uid.isInvalid();
 }
 
 static bool subkeyIsOk(const Subkey s)
 {
     return !s.isRevoked() && !s.isInvalid() && !s.isDisabled();
 }
 
 static QGpgMEKeyForMailboxJob::result_type do_work(Context *ctx, const QString &mailbox, bool canEncrypt)
 {
     /* Do a Keylisting. */
-    ctx->setKeyListMode(GpgME::Extern | GpgME::Local | GpgME::Signatures | GpgME::Validate);
+    ctx->setKeyListMode(GpgME::Locate | GpgME::Signatures | GpgME::Validate);
     std::vector<Key> keys;
     QGpgMEKeyListJob *keylist = new QGpgMEKeyListJob(ctx);
 
     KeyListResult result = keylist->exec(QStringList() << mailbox, false, keys);
 
     if (result.error()) {
         return std::make_tuple(result, Key(), UserID(), QString(), Error());
     }
 
     // This should ideally be decided by GnuPG and this Job changed
     // to just call the according API in GpgME
     // See: https://bugs.gnupg.org/gnupg/issue2359
     Key keyC;
     UserID uidC;
     Q_FOREACH (const Key k, keys) {
         if (canEncrypt && !k.canEncrypt()) {
             continue;
         }
         /* First get the uid that matches the mailbox */
         Q_FOREACH (const UserID u, k.userIDs()) {
             if (QString::fromUtf8(u.email()).toLower() == mailbox.toLower()) {
                 if (uidC.isNull()) {
                     keyC = k;
                     uidC = u;
                 } else if ((!uidIsOk(uidC) && uidIsOk(u)) || uidC.validity() < u.validity()) {
                     /* Validity of the new key is better. */
                     uidC = u;
                     keyC = k;
                 } else if (uidC.validity() == u.validity() && uidIsOk(u)) {
                     /* Both are the same check which one is newer. */
                     time_t oldTime = 0;
                     Q_FOREACH (const Subkey s, keyC.subkeys()) {
                         if ((canEncrypt && s.canEncrypt()) && subkeyIsOk(s)) {
                             oldTime = s.creationTime();
                         }
                     }
                     time_t newTime = 0;
                     Q_FOREACH (const Subkey s, k.subkeys()) {
                         if ((canEncrypt && s.canEncrypt()) && subkeyIsOk(s)) {
                             newTime = s.creationTime();
                         }
                     }
                     if (newTime > oldTime) {
                         uidC = u;
                         keyC = k;
                     }
                 }
             }
         }
     }
     return std::make_tuple(result, keyC, uidC, QString(), Error());
 }
 
 Error QGpgMEKeyForMailboxJob::start(const QString &mailbox, bool canEncrypt)
 {
     run(std::bind(&do_work, std::placeholders::_1, mailbox, canEncrypt));
     return Error();
 }
 
 KeyListResult QGpgMEKeyForMailboxJob::exec(const QString &mailbox, bool canEncrypt, Key &key, UserID &uid)
 {
     const result_type r = do_work(context(), mailbox, canEncrypt);
     resultHook(r);
     key = std::get<1>(r);
     uid = std::get<2>(r);
     return std::get<0>(r);
 }
 
 #include "qgpgmekeyformailboxjob.moc"