diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json
index ee8320f0b..e0a2fcbf0 100644
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -1,323 +1,323 @@
 {
     "app-id": "org.kde.kleopatra",
     "runtime": "org.kde.Platform",
     "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "command": "kleopatra",
     "rename-icon": "kleopatra",
     "finish-args": [
         "--share=ipc",
         "--share=network",
         "--socket=wayland",
         "--socket=fallback-x11",
         "--filesystem=~/.gnupg:create",
         "--filesystem=xdg-run/gnupg:ro",
         "--talk-name=org.kde.StatusNotifierWatcher"
     ],
     "modules": [
         {
             "name": "boost",
             "buildsystem": "simple",
             "build-commands": [
                 "./bootstrap.sh --prefix=/app --with-libraries=system",
                 "./b2 -j $FLATPAK_BUILDER_N_JOBS install"
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2",
                     "sha256": "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 6845,
                         "stable-only": true,
                         "url-template": "https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_${major}_${minor}_$patch.tar.bz2"
                     }
                 }
             ]
         },
         {
             "name": "paperkey",
             "buildsystem": "autotools",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.jabberwocky.com/software/paperkey/paperkey-1.6.tar.gz",
                     "sha256": "a245fd13271a8d2afa03dde979af3a29eb3d4ebb1fbcad4a9b52cf67a27d05f7",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 8571,
                         "stable-only": true,
                         "url-template": "http://www.jabberwocky.com/software/paperkey/paperkey-$version.tar.gz"
                     }
                 },
                 {
                     "type": "shell",
                     "commands": [
                         "cp -p /usr/share/automake-*/config.{sub,guess} ."
                     ]
                 }
             ]
         },
         {
             "name": "QGpgme",
             "buildsystem": "autotools",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.23.2.tar.bz2",
                     "sha256": "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 1239,
                         "stable-only": true,
                         "url-template": "https://gnupg.org/ftp/gcrypt/gpgme/gpgme-$version.tar.bz2"
                     }
                 }
             ]
         },
                 {
                     "name": "qtkeychain",
                     "buildsystem": "cmake-ninja",
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.1.tar.gz",
                             "sha256": "afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c",
                             "x-checker-data": {
                                 "type": "anitya",
                                 "project-id": 4138,
                                 "stable-only": true,
                                 "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/$version.tar.gz"
                             }
                         }
                     ],
                     "config-opts": [
                         "-DCMAKE_INSTALL_LIBDIR=/app/lib",
                         "-DLIB_INSTALL_DIR=/app/lib",
                         "-DBUILD_TRANSLATIONS=NO",
                         "-DBUILD_WITH_QT6=ON"
                     ],
                     "cleanup": [
                         "/include",
                         "/lib/cmake",
                         "/mkspecs"
                     ],
                     "modules": [
                         {
                             "name": "libsecret",
                             "buildsystem": "meson",
                             "config-opts": [
                                 "-Dmanpage=false",
                                 "-Dvapi=false",
                                 "-Dgtk_doc=false",
                                 "-Dintrospection=false",
                                 "-Dgcrypt=false"
                             ],
                             "sources": [
                                 {
                                     "type": "archive",
                                     "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
                                     "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d",
                                     "x-checker-data": {
                                         "type": "gnome",
                                         "name": "libsecret",
                                         "stable-only": true
                                     }
                                 }
                             ],
                             "cleanup": [
                                 "/bin/secret-tool",
                                 "/include",
                                 "/lib/pkgconfig"
                             ]
                         }
                     ]
                 },
         {
             "name": "ktextaddons",
             "buildsystem": "cmake-ninja",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
                 "-DBUILD_WITH_QT6=ON"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/libraries/ktextaddons",
                     "branch": "1.5"
                 }
             ]
         },
         {
             "name": "kpimtextedit",
             "buildsystem": "cmake-ninja",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/kpimtextedit",
                     "branch": "release/24.02"
                 }
             ]
         },
         {
             "name": "libkleo",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/libkleo",
-                    "branch": "release/24.02"
+                    "branch": "master"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         },
         {
             "name": "kmime",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/kmime",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         },
         {       
             "name": "akonadi",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/akonadi",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         },
         {
             "name": "akonadi-mime",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/akonadi-mime",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         },
         {
             "name": "ksmtp",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/ksmtp.git",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]
         },
         {
             "name": "kgapi",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/libkgapi.git",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]
         },	
         {
             "name": "mailtransport",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/kmailtransport",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         },
         {
             "name": "kidentitymanager",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/kidentitymanagement",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DBUILD_QUICK_SUPPORT=OFF"
             ]	    
         },
         {
             "name": "kmbox",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/kmbox",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]
         },	
         {
             "name": "mmetreeparser",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://invent.kde.org/pim/mimetreeparser",
                     "branch": "release/24.02"
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         },
         {
             "name": "kleopatra",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "dir",
                     "path": "."
                 }
             ],
             "config-opts": [
                 "-DBUILD_TESTING=OFF"
             ]	    
         }
     ]
 }