diff --git a/CHANGELOG.md b/CHANGELOG.md
index a24c82cd..dc0891ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 - Release v2.1.5-2023.07 🎉
 - Fix RFC 1918 RegExp [\#210](https://github.com/torrentpier/torrentpier-lts/pull/210) ([belomaxorka](https://github.com/belomaxorka))
+- Maked max smilies in PM configurable [\#211](https://github.com/torrentpier/torrentpier-lts/pull/211) ([belomaxorka](https://github.com/belomaxorka))
 
 ## [v2.1.5-2023.06](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.06) (2023-07-04)
 [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.05...v2.1.5-2023.06)
diff --git a/privmsg.php b/privmsg.php
index 3034f99e..265a77c2 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -927,6 +927,17 @@ else if ( $submit || $refresh || $mode != '' )
 			$error = TRUE;
 			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['EMPTY_MESSAGE'];
 		}
+		
+		// Check smilies limit
+		if ($bb_cfg['max_smilies_pm'])
+		{
+			$count_smilies = substr_count(bbcode2html($privmsg_message), '<img class="smile" src="'. $bb_cfg['smilies_path']);
+			if ($count_smilies > $bb_cfg['max_smilies_pm'])
+			{
+				$error = TRUE;
+				$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . sprintf($lang['MAX_SMILIES_PER_POST'], $bb_cfg['max_smilies_pm']);
+			}
+		}
 	}
 
 	if ( $submit && !$error )