diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix
similarity index 86%
rename from pkgs/development/python-modules/alot/default.nix
rename to pkgs/applications/networking/mailreaders/alot/default.nix
index 6aa09f70ba3a..6de601348c3b 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/applications/networking/mailreaders/alot/default.nix
@@ -1,9 +1,13 @@
-{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook
-, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
-, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
+{ lib, python3, fetchFromGitHub, file, gnupg, gawk, notmuch, procps, withManpage ? false
 }:
 
-buildPythonPackage rec {
+with python3.pkgs;
+
+let
+  notmuch2 = callPackage ./notmuch.nix {
+    inherit notmuch;
+  };
+in buildPythonApplication rec {
   pname = "alot";
   version = "0.10";
   outputs = [ "out" ] ++ lib.optional withManpage "man";
diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/applications/networking/mailreaders/alot/notmuch.nix
similarity index 100%
rename from pkgs/development/python-modules/notmuch/2.nix
rename to pkgs/applications/networking/mailreaders/alot/notmuch.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25ace7ca8d02..541e1daf4dcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24212,7 +24212,7 @@ with pkgs;
 
   alock = callPackage ../misc/screensavers/alock { };
 
-  inherit (python3Packages) alot;
+  alot = callPackage ../applications/networking/mailreaders/alot { };
 
   alpine = callPackage ../applications/networking/mailreaders/alpine {
     tcl = tcl-8_5;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06aac66fd852..cbe6fba4cd34 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -458,8 +458,6 @@ in {
 
   allure-pytest = callPackage ../development/python-modules/allure-pytest { };
 
-  alot = callPackage ../development/python-modules/alot { };
-
   alpha-vantage = callPackage ../development/python-modules/alpha-vantage { };
 
   altair = callPackage ../development/python-modules/altair { };
@@ -5443,10 +5441,6 @@ in {
     inherit (pkgs) notmuch;
   };
 
-  notmuch2 = callPackage ../development/python-modules/notmuch/2.nix {
-    inherit (pkgs) notmuch;
-  };
-
   nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
 
   notus-scanner = callPackage ../development/python-modules/notus-scanner { };