diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
new file mode 100644
index 000000000000..cbf675af4da5
--- /dev/null
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "libytnef-${version}";
+  version = "1.9.2";
+
+  src = fetchFromGitHub {
+    owner = "Yeraze";
+    repo = "ytnef";
+    rev = "v${version}";
+    sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "Yeraze's TNEF Stream Reader - for winmail.dat files";
+    license = licenses.gpl2Plus;
+    platform = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cd35174ed97..2583483407da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9019,6 +9019,8 @@ with pkgs;
 
   libykneomgr = callPackage ../development/libraries/libykneomgr { };
 
+  libytnef = callPackage ../development/libraries/libytnef { };
+
   libyubikey = callPackage ../development/libraries/libyubikey { };
 
   libzen = callPackage ../development/libraries/libzen { };
@@ -13157,6 +13159,7 @@ with pkgs;
 
   claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
     inherit (gnome3) gsettings_desktop_schemas;
+    inherit (xorg) libSM;
     enableNetworkManager = config.networking.networkmanager.enable or false;
   };