diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7815b53f6..7f1a548d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Add referrer "origin" policy to repository links [\#1357](https://github.com/torrentpier/torrentpier/pull/1357) ([kovalensky](https://github.com/kovalensky))
 - Added new flag 🕊 [\#1347](https://github.com/torrentpier/torrentpier/pull/1347) ([belomaxorka](https://github.com/belomaxorka))
 - Added ability to view "Watching topics" of other people's (For admins only) [\#1336](https://github.com/torrentpier/torrentpier/pull/1336) ([belomaxorka](https://github.com/belomaxorka))
+- Added `[box]` BBCode tag [\#1368](https://github.com/torrentpier/torrentpier/pull/1368) ([belomaxorka](https://github.com/belomaxorka))
 - Added `bt_announce_url` autofill [\#1331](https://github.com/torrentpier/torrentpier/pull/1331) ([belomaxorka](https://github.com/belomaxorka))
 - Added "Random release" button in tracker.php [\#1334](https://github.com/torrentpier/torrentpier/pull/1334) ([belomaxorka](https://github.com/belomaxorka))
 - Added support for fastly cdn [\#1327](https://github.com/torrentpier/torrentpier/pull/1327) ([belomaxorka](https://github.com/belomaxorka), [kovalensky](https://github.com/kovalensky))
@@ -36,7 +37,7 @@
 - Don't update downloads counter if attachment not exists [\#1345](https://github.com/torrentpier/torrentpier/pull/1345) ([belomaxorka](https://github.com/belomaxorka))
 - Minor improvements [\#1306](https://github.com/torrentpier/torrentpier/pull/1306), [\#1307](https://github.com/torrentpier/torrentpier/pull/1307), [\#1308](https://github.com/torrentpier/torrentpier/pull/1308), [\#1315](https://github.com/torrentpier/torrentpier/pull/1315), [\#1328](https://github.com/torrentpier/torrentpier/pull/1328), [\#1338](https://github.com/torrentpier/torrentpier/pull/1338), [\#1353](https://github.com/torrentpier/torrentpier/pull/1353), [\#1355](https://github.com/torrentpier/torrentpier/pull/1355), [\#1358](https://github.com/torrentpier/torrentpier/pull/1358) ([belomaxorka](https://github.com/belomaxorka))
 - Some bugfixes [\#1326](https://github.com/torrentpier/torrentpier/pull/1326) ([belomaxorka](https://github.com/belomaxorka))
-- Updated deps [\#1304](https://github.com/torrentpier/torrentpier/pull/1304), [\#1305](https://github.com/torrentpier/torrentpier/pull/1305) ([belomaxorka](https://github.com/belomaxorka))
+- Updated deps [\#1304](https://github.com/torrentpier/torrentpier/pull/1304), [\#1305](https://github.com/torrentpier/torrentpier/pull/1305), [\#1305](https://github.com/torrentpier/torrentpier/pull/1305), [\#1367](https://github.com/torrentpier/torrentpier/pull/1367), [\#1366](https://github.com/torrentpier/torrentpier/pull/1366), [\#1365](https://github.com/torrentpier/torrentpier/pull/1365) ([belomaxorka](https://github.com/belomaxorka))
 - New Crowdin updates [\#1311](https://github.com/torrentpier/torrentpier/pull/1311), [\#1314](https://github.com/torrentpier/torrentpier/pull/1314), [\#1335](https://github.com/torrentpier/torrentpier/pull/1335), [\#1337](https://github.com/torrentpier/torrentpier/pull/1337), [\#1344](https://github.com/torrentpier/torrentpier/pull/1344) ([Exileum](https://github.com/Exileum))
 
 ## [v2.4.0](https://github.com/torrentpier/torrentpier/tree/v2.4.0) (2024-01-01)
diff --git a/library/language/source/main.php b/library/language/source/main.php
index 310fbabe6..d9c4ce99c 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1530,6 +1530,7 @@ $lang['BOLD'] = 'Bold text: [b]text[/b] (Ctrl+B)';
 $lang['ITALIC'] = 'Italic text: [i]text[/i] (Ctrl+I)';
 $lang['UNDERLINE'] = 'Underline text: [u]text[/u] (Ctrl+U)';
 $lang['STRIKEOUT'] = 'Strikeout text: [s]text[/s] (Ctrl+S)';
+$lang['BOX_TAG'] = 'Frame around text: [box]text[/box]';
 $lang['SUPERSCRIPT'] = 'Superscript text: [sup]text[/sup]';
 $lang['SUBSCRIPT'] = 'Subscript text: [sub]text[/sub]';
 $lang['QUOTE_TITLE'] = 'Quote text: [quote]text[/quote] (Ctrl+Q)';
diff --git a/src/Legacy/BBCode.php b/src/Legacy/BBCode.php
index b8af68f8b..8c7ad9fd2 100644
--- a/src/Legacy/BBCode.php
+++ b/src/Legacy/BBCode.php
@@ -124,6 +124,8 @@ class BBCode
             '[/sup]' => '</sup>',
             '[sub]' => '<sub>',
             '[/sub]' => '</sub>',
+            '[box]' => '<div class="post-box-default"><div class="post-box">',
+            '[/box]' => '</div></div>',
             '[del]' => '<span class="post-s">',
             '[/del]' => '</span>',
             '[clear]' => '<div class="clear">&nbsp;</div>',
diff --git a/styles/templates/default/css/globals.css b/styles/templates/default/css/globals.css
index 5c8900467..d060d1ff0 100644
--- a/styles/templates/default/css/globals.css
+++ b/styles/templates/default/css/globals.css
@@ -366,6 +366,20 @@ a.gen, a.med, a.genmed, a.small, a.gensmall {
   text-decoration: line-through;
 }
 
+.post-box-default {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.post-box {
+  display: inline-block;
+  border: 1px solid #a7b4ba;
+  border-radius: 3px;
+  line-height: 150%;
+  margin: 1px 5px;
+  padding: 0 8px 1px;
+}
+
 /* ---------------------------------- *
      Code blocks
  * ---------------------------------- */
diff --git a/styles/templates/default/posting_editor.tpl b/styles/templates/default/posting_editor.tpl
index 5245fb54d..d4b5f271a 100644
--- a/styles/templates/default/posting_editor.tpl
+++ b/styles/templates/default/posting_editor.tpl
@@ -75,6 +75,7 @@ ajax.callback.posts = function(data) {
 	<input type="button" value="&#8212;" name="codeHR" title="{L_HOR_LINE}" style="font-weight: bold;" />
 	<input type="button" value="&para;" name="codeBR" title="{L_NEW_LINE}" />&nbsp;
 	<input type="button" value="{L_SPOILER}" name="codeSpoiler" title="{L_SPOILER}" />
+    <input type="button" value="box" name="codeBox" title="{L_BOX_TAG}" />
 </span>
 
 <div class="buttons floatR">
@@ -205,6 +206,7 @@ function checkForm(form) {
     bbcode.addTag("codeSpoiler", "spoiler", null, "", ctrl);
     bbcode.addTag("codeSup", "sup", null, "", ctrl);
     bbcode.addTag("codeSub", "sub", null, "", ctrl);
+    bbcode.addTag("codeBox", "box", null, "", ctrl);
 
     bbcode.addTag("fontFace", function (e) {
         var v = e.value;