diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index e195ab4cb..d9ef9ae86 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -624,6 +624,7 @@ VALUES ('1', 'Attach maintenance', 'attach_maintenance.php', 'daily', '', '05:00
         '0',
         '1', '0'),
        ('1', 'Logs cleanup', 'clean_log.php', 'daily', '', '05:00:00', '70', '', '', '', '1', '', '0', '1', '0'),
+       ('1', 'PM cleanup', 'clean_pm.php', 'daily', '', '05:00:00', '70', '', '', '', '1', '', '0', '1', '0'),
        ('1', 'Tracker maintenance', 'tr_maintenance.php', 'daily', '', '05:00:00', '90', '', '', '', '1', '', '0', '1',
         '0'),
        ('1', 'Clean dlstat', 'clean_dlstat.php', 'daily', '', '05:00:00', '100', '', '', '', '1', '', '0', '1', '0'),
diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt
index a06277502..fa40750d9 100644
--- a/install/upgrade/changes.txt
+++ b/install/upgrade/changes.txt
@@ -60,3 +60,6 @@ ALTER TABLE `bb_users` CHANGE `user_newpasswd` `user_newpasswd` VARCHAR(255) NOT
 
 // 2.4.0-alpha3
 INSERT INTO bb_config VALUES ('show_board_start_index', '1');
+
+// 2.4.0-beta2
+INSERT INTO `bb_cron` VALUES (NULL, '1', 'PM cleanup', 'clean_pm.php', 'daily', '', '05:00:00', '70', '', '', '', '1', '', '0', '1', '0');
diff --git a/library/config.php b/library/config.php
index 52e439a8a..aef5bcda3 100644
--- a/library/config.php
+++ b/library/config.php
@@ -493,7 +493,7 @@ $bb_cfg['max_savebox_privmsgs'] = 500; // максимальное число с
 $bb_cfg['max_sentbox_privmsgs'] = 500; // максимальное число сообщений в папке отправленные
 $bb_cfg['max_smilies_pm'] = 15; // максимальное число смайлов в сообщении (0 - без ограничения)
 $bb_cfg['max_symbols_pm'] = 1500; // TODO: максимальное число символов в сообщении (0 - без ограничения)
-$bb_cfg['pm_days_keep'] = 180; // TODO: время хранения ЛС
+$bb_cfg['pm_days_keep'] = 180; // время хранения ЛС
 
 // Actions log
 $bb_cfg['log_days_keep'] = 365; // время хранения истории действий
diff --git a/library/includes/cron/jobs/clean_pm.php b/library/includes/cron/jobs/clean_pm.php
new file mode 100644
index 000000000..416260c2f
--- /dev/null
+++ b/library/includes/cron/jobs/clean_pm.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * TorrentPier – Bull-powered BitTorrent tracker engine
+ *
+ * @copyright Copyright (c) 2005-2023 TorrentPier (https://torrentpier.com)
+ * @link      https://github.com/torrentpier/torrentpier for the canonical source repository
+ * @license   https://github.com/torrentpier/torrentpier/blob/master/LICENSE MIT License
+ */
+
+if (!defined('BB_ROOT')) {
+    die(basename(__FILE__));
+}
+
+$pm_days_keep = (int)$bb_cfg['pm_days_keep'];
+
+DB()->query("
+	DELETE FROM " . BB_PRIVMSGS . "
+	WHERE privmsgs_date < " . (TIMENOW - 86400 * $pm_days_keep) . "
+");