diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,6 @@
 
 find_package(KF5 REQUIRED COMPONENTS
     AkonadiCalendar
-    AkonadiNotes
     AkonadiSearch
     IdentityManagement
     KontactInterface
diff --git a/src/akonadi/CMakeLists.txt b/src/akonadi/CMakeLists.txt
--- a/src/akonadi/CMakeLists.txt
+++ b/src/akonadi/CMakeLists.txt
@@ -31,7 +31,6 @@
     KF5::AkonadiCalendar
     KF5::AkonadiCore
     KF5::AkonadiWidgets
-    KF5::Mime
     KF5::CalendarCore
     KF5::IdentityManagement
     KF5::ConfigCore
diff --git a/src/akonadi/akonadiserializer.cpp b/src/akonadi/akonadiserializer.cpp
--- a/src/akonadi/akonadiserializer.cpp
+++ b/src/akonadi/akonadiserializer.cpp
@@ -29,7 +29,6 @@
 #include <AkonadiCore/EntityDisplayAttribute>
 #include <AkonadiCore/Item>
 #include <KCalCore/Todo>
-#include <KMime/Message>
 #include <QMimeDatabase>
 
 #include <numeric>
diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt
--- a/tests/testlib/CMakeLists.txt
+++ b/tests/testlib/CMakeLists.txt
@@ -20,10 +20,8 @@
 add_library(testlib STATIC ${testlib_SRCS})
 target_link_libraries(testlib
     KF5::AkonadiCore
-    KF5::AkonadiNotes
     KF5::AkonadiXml
     KF5::CalendarCore
-    KF5::Mime
     Qt5::Test
     KF5::KDELibs4Support
 )
diff --git a/tests/testlib/akonadifakedata.cpp b/tests/testlib/akonadifakedata.cpp
--- a/tests/testlib/akonadifakedata.cpp
+++ b/tests/testlib/akonadifakedata.cpp
@@ -25,7 +25,6 @@
 #include "akonadifakemonitor.h"
 #include "akonadifakestorage.h"
 
-#include <Akonadi/Notes/NoteUtils>
 #include <KCalCore/Todo>
 
 #include "akonadi/akonadiapplicationselectedattribute.h"
@@ -136,8 +135,7 @@
     m_monitor->changeCollection(notifiedCollection);
 
     const auto mimeTypes = collection.contentMimeTypes();
-    if (mimeTypes.contains(KCalCore::Todo::todoMimeType())
-     || mimeTypes.contains(Akonadi::NoteUtils::noteMimeType())) {
+    if (mimeTypes.contains(KCalCore::Todo::todoMimeType())) {
         const auto oldAttribute = oldCollection.attribute<Akonadi::ApplicationSelectedAttribute>();
         const auto oldSelected = oldAttribute ? oldAttribute->isSelected() : true;
         const auto newAttribute = newCollection.attribute<Akonadi::ApplicationSelectedAttribute>();
diff --git a/tests/testlib/gencollection.cpp b/tests/testlib/gencollection.cpp
--- a/tests/testlib/gencollection.cpp
+++ b/tests/testlib/gencollection.cpp
@@ -24,7 +24,6 @@
 #include "gencollection.h"
 
 #include <AkonadiCore/EntityDisplayAttribute>
-#include <Akonadi/Notes/NoteUtils>
 
 #include <KCalCore/Todo>
 
@@ -98,11 +97,12 @@
 
 GenCollection &GenCollection::withNoteContent(bool value)
 {
+    const auto noteMime = QString("text/x-vnd.akonadi.note");
     auto mimeTypes = m_collection.contentMimeTypes();
     if (!value) {
-        mimeTypes.removeAll(Akonadi::NoteUtils::noteMimeType());
-    } else if (!mimeTypes.contains(Akonadi::NoteUtils::noteMimeType())) {
-        mimeTypes.append(Akonadi::NoteUtils::noteMimeType());
+        mimeTypes.removeAll(noteMime);
+    } else if (!mimeTypes.contains(noteMime)) {
+        mimeTypes.append(noteMime);
     }
     m_collection.setContentMimeTypes(mimeTypes);
     return *this;
diff --git a/tests/units/akonadi/akonadilivequeryhelperstest.cpp b/tests/units/akonadi/akonadilivequeryhelperstest.cpp
--- a/tests/units/akonadi/akonadilivequeryhelperstest.cpp
+++ b/tests/units/akonadi/akonadilivequeryhelperstest.cpp
@@ -28,8 +28,6 @@
 #include <functional>
 
 #include <KCalCore/Todo>
-#include <KMime/Message>
-#include <Akonadi/Notes/NoteUtils>
 
 #include "akonadi/akonadiserializer.h"
 
@@ -48,12 +46,6 @@
     if (item.hasPayload<KCalCore::Todo::Ptr>()) {
         const auto todo = item.payload<KCalCore::Todo::Ptr>();
         return todo->summary();
-
-    } else if (item.hasPayload<KMime::Message::Ptr>()) {
-        const auto message = item.payload<KMime::Message::Ptr>();
-        const Akonadi::NoteUtils::NoteMessageWrapper note(message);
-        return note.title();
-
     } else {
         return QString();
     }
diff --git a/tests/units/akonadi/akonadilivequeryintegratortest.cpp b/tests/units/akonadi/akonadilivequeryintegratortest.cpp
--- a/tests/units/akonadi/akonadilivequeryintegratortest.cpp
+++ b/tests/units/akonadi/akonadilivequeryintegratortest.cpp
@@ -24,8 +24,6 @@
 #include <testlib/qtest_zanshin.h>
 
 #include <KCalCore/Todo>
-#include <KMime/Message>
-#include <Akonadi/Notes/NoteUtils>
 
 #include "akonadi/akonadicollectionfetchjobinterface.h"
 #include "akonadi/akonadiitemfetchjobinterface.h"
@@ -50,12 +48,6 @@
     if (item.hasPayload<KCalCore::Todo::Ptr>()) {
         const auto todo = item.payload<KCalCore::Todo::Ptr>();
         return todo->summary();
-
-    } else if (item.hasPayload<KMime::Message::Ptr>()) {
-        const auto message = item.payload<KMime::Message::Ptr>();
-        const Akonadi::NoteUtils::NoteMessageWrapper note(message);
-        return note.title();
-
     } else {
         return QString();
     }
diff --git a/tests/units/akonadi/akonadiserializertest.cpp b/tests/units/akonadi/akonadiserializertest.cpp
--- a/tests/units/akonadi/akonadiserializertest.cpp
+++ b/tests/units/akonadi/akonadiserializertest.cpp
@@ -31,10 +31,8 @@
 #include <AkonadiCore/Collection>
 #include <AkonadiCore/EntityDisplayAttribute>
 #include <AkonadiCore/Item>
-#include <Akonadi/Notes/NoteUtils>
 #include <AkonadiCore/Tag>
 #include <KCalCore/Todo>
-#include <KMime/Message>
 
 Q_DECLARE_METATYPE(Akonadi::Item*)
 
@@ -114,16 +112,8 @@
         todo2->setUid(QStringLiteral("1"));
         item2.setPayload<KCalCore::Todo::Ptr>(todo2);
 
-        Akonadi::Item item3;
-        KMime::Message::Ptr message(new KMime::Message);
-        message->subject(true)->fromUnicodeString(QStringLiteral("foo"), "utf-8");
-        message->mainBodyPart()->fromUnicodeString(QStringLiteral("bar"));
-        item3.setMimeType(Akonadi::NoteUtils::noteMimeType());
-        item3.setPayload<KMime::Message::Ptr>(message);
-
         QTest::newRow("task without uid") << item1 << QString();
         QTest::newRow("task with uid") << item2 << "1";
-        QTest::newRow("note") << item3 << QString();
     }
 
     void shouldKnowTaskItemUid()
@@ -1614,15 +1604,6 @@
             auto todo = item.payload<KCalCore::Todo::Ptr>();
             const QString relatedUid = todo->relatedTo();
             QCOMPARE(relatedUid, expectedRelatedToUid);
-        } else if (item.hasPayload<KMime::Message::Ptr>()) {
-            auto note = item.payload<KMime::Message::Ptr>();
-            const auto relatedHeader = note->headerByType("X-Zanshin-RelatedProjectUid");
-            const QString relatedUid = relatedHeader ? relatedHeader->asUnicodeString() : QString();
-            QCOMPARE(relatedUid, expectedRelatedToUid);
-            if (!expectedRelatedToUid.isEmpty())
-                QVERIFY(note->encodedContent().contains(QStringLiteral("X-Zanshin-RelatedProjectUid: %1").arg(expectedRelatedToUid).toUtf8()));
-            else
-                QVERIFY(!note->encodedContent().contains("X-Zanshin-RelatedProjectUid:"));
         }
     }