diff --git a/controllers/rest/EntryController.php b/controllers/rest/EntryController.php
index fac9a3a8..2c59440f 100644
--- a/controllers/rest/EntryController.php
+++ b/controllers/rest/EntryController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2020 HumHub GmbH & Co. KG
diff --git a/controllers/rest/MessageController.php b/controllers/rest/MessageController.php
index aa7ada44..d67268f7 100644
--- a/controllers/rest/MessageController.php
+++ b/controllers/rest/MessageController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2020 HumHub GmbH & Co. KG
diff --git a/controllers/rest/TagController.php b/controllers/rest/TagController.php
index d16b3af3..49c395a0 100644
--- a/controllers/rest/TagController.php
+++ b/controllers/rest/TagController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2020 HumHub GmbH & Co. KG
diff --git a/controllers/rest/UserController.php b/controllers/rest/UserController.php
index 44c5a1f1..2620223e 100644
--- a/controllers/rest/UserController.php
+++ b/controllers/rest/UserController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2020 HumHub GmbH & Co. KG
diff --git a/helpers/RestDefinitions.php b/helpers/RestDefinitions.php
index 0028c329..fb1c00f6 100644
--- a/helpers/RestDefinitions.php
+++ b/helpers/RestDefinitions.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2020 HumHub GmbH & Co. KG
diff --git a/models/AbstractMessageEntry.php b/models/AbstractMessageEntry.php
index e4cdcdd6..8dc1a770 100644
--- a/models/AbstractMessageEntry.php
+++ b/models/AbstractMessageEntry.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
diff --git a/models/Config.php b/models/Config.php
index e3009f15..7ef02295 100644
--- a/models/Config.php
+++ b/models/Config.php
@@ -2,11 +2,13 @@
 
 namespace humhub\modules\mail\models;
 
-use DateInterval;
-use DateTime;
-use humhub\modules\user\models\User;
 use Yii;
+use DateTime;
+use DateInterval;
 use humhub\modules\mail\Module;
+use humhub\modules\user\models\User;
+use humhub\modules\mail\models\states\MessageUserLeft;
+use humhub\modules\mail\models\states\MessageUserJoined;
 
 /**
  * ConfigureForm defines the configurable fields.
@@ -30,6 +32,20 @@ class Config extends \yii\base\Model
 
     public $userMessageRestriction = null;
 
+    public $enableMessageUserJoined = true;
+
+    public $enableMessageUserLeft = true;
+
+    /**
+     * The settings array, containing the necessary settings for the MessageUserJoined and MessageUserLeft states.
+     *
+     * @var array
+     */
+    private $settings = [
+        MessageUserJoined::SETTING_ENABLE_MESSAGE_USER_JOINED => true,
+        MessageUserLeft::SETTING_ENABLE_MESSAGE_USER_LEFT => true,
+    ];
+
     public function init()
     {
         parent::init();
@@ -41,6 +57,8 @@ public function init()
         $this->newUserMessageRestriction = (int) $module->settings->get('newUserMessageRestriction', $this->newUserMessageRestriction);
         $this->userConversationRestriction = (int) $module->settings->get('userConversationRestriction', $this->userConversationRestriction);
         $this->userMessageRestriction = (int) $module->settings->get('userMessageRestriction', $this->userMessageRestriction);
+        $this->enableMessageUserJoined = (bool) $module->settings->get('enableMessageUserJoined', $this->enableMessageUserJoined);
+        $this->enableMessageUserLeft = (bool) $module->settings->get('enableMessageUserLeft', $this->enableMessageUserLeft);
     }
 
     /**
@@ -57,7 +75,7 @@ public static function getModule()
     public function rules()
     {
         return [
-            [['showInTopNav', 'newUserRestrictionEnabled'], 'boolean'],
+            [['showInTopNav', 'newUserRestrictionEnabled', 'enableMessageUserJoined', 'enableMessageUserLeft'], 'boolean'],
             [['newUserConversationRestriction',
                 'newUserMessageRestriction',
                 'userConversationRestriction',
@@ -81,6 +99,8 @@ public function attributeLabels()
             'newUserMessageRestriction' => Yii::t('MailModule.base', 'Max number of messages allowed for a new user per day'),
             'userConversationRestriction' => Yii::t('MailModule.base', 'Max number of new conversations allowed for a user per day'),
             'userMessageRestriction' => Yii::t('MailModule.base', 'Max messages allowed per day'),
+            'enableMessageUserJoined' => Yii::t('MailModule.base', 'Enable "User Joined" message'),
+            'enableMessageUserLeft' => Yii::t('MailModule.base', 'Enable "User Left" message'),
         ];
     }
 
@@ -98,9 +118,34 @@ public function save()
         $module->settings->set('newUserMessageRestriction', $this->newUserMessageRestriction);
         $module->settings->set('userConversationRestriction', $this->userConversationRestriction);
         $module->settings->set('userMessageRestriction', $this->userMessageRestriction);
+        $module->settings->set('enableMessageUserJoined', $this->enableMessageUserJoined);
+        $module->settings->set('enableMessageUserLeft', $this->enableMessageUserLeft);
         return true;
     }
 
+    public function afterSave($insert, $changedAttributes)
+    {
+        parent::afterSave($insert, $changedAttributes);
+
+        // Update the settings for MessageUserJoined and MessageUserLeft states
+        $module = $this->getModule();
+        $module->settings->set(MessageUserJoined::SETTING_ENABLE_MESSAGE_USER_JOINED, $this->enableMessageUserJoined);
+        $module->settings->set(MessageUserLeft::SETTING_ENABLE_MESSAGE_USER_LEFT, $this->enableMessageUserLeft);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function afterDelete()
+    {
+        parent::afterDelete();
+
+        // Inform about user left if the corresponding setting is enabled
+        if ($this->settings[MessageUserLeft::SETTING_ENABLE_MESSAGE_USER_LEFT]) {
+            MessageUserLeft::inform($this->message, $this->user);
+        }
+    }
+
     public function canCreateConversation(User $originator)
     {
         if ($originator->isSystemAdmin()) {
diff --git a/models/UserMessage.php b/models/UserMessage.php
index 002e80a9..533da247 100644
--- a/models/UserMessage.php
+++ b/models/UserMessage.php
@@ -2,11 +2,11 @@
 
 namespace humhub\modules\mail\models;
 
+use Yii;
 use humhub\components\ActiveRecord;
-use humhub\modules\mail\models\states\MessageUserJoined;
-use humhub\modules\mail\models\states\MessageUserLeft;
 use humhub\modules\user\models\User;
-use Yii;
+use humhub\modules\mail\models\states\MessageUserLeft;
+use humhub\modules\mail\models\states\MessageUserJoined;
 
 /**
  * This class represents the relation between users and conversations.
@@ -32,6 +32,16 @@
  */
 class UserMessage extends ActiveRecord
 {
+    /**
+     * The settings array, containing the necessary settings for the MessageUserJoined and MessageUserLeft states.
+     *
+     * @var array
+     */
+    private $settings = [
+        MessageUserJoined::SETTING_ENABLE_MESSAGE_USER_JOINED => true,
+        MessageUserLeft::SETTING_ENABLE_MESSAGE_USER_LEFT => true,
+    ];
+
     public bool $informAfterAdd = true;
 
     /**
@@ -129,7 +139,7 @@ public function afterSave($insert, $changedAttributes)
     {
         parent::afterSave($insert, $changedAttributes);
 
-        if ($insert && $this->informAfterAdd) {
+        if ($insert && $this->informAfterAdd && MessageUserJoined::isEnabled($this->settings)) {
             MessageUserJoined::inform($this->message, $this->user);
         }
     }
@@ -140,6 +150,9 @@ public function afterSave($insert, $changedAttributes)
     public function afterDelete()
     {
         parent::afterDelete();
-        MessageUserLeft::inform($this->message, $this->user);
+
+        if (MessageUserLeft::isEnabled($this->settings)) {
+            MessageUserLeft::inform($this->message, $this->user);
+        }
     }
 }
diff --git a/models/states/AbstractMessageState.php b/models/states/AbstractMessageState.php
index 2f493bfa..dd3bda6f 100644
--- a/models/states/AbstractMessageState.php
+++ b/models/states/AbstractMessageState.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
diff --git a/models/states/MessageUserJoined.php b/models/states/MessageUserJoined.php
index 3b5df22d..66adfee6 100644
--- a/models/states/MessageUserJoined.php
+++ b/models/states/MessageUserJoined.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
@@ -15,6 +16,16 @@
  */
 class MessageUserJoined extends AbstractMessageState
 {
+    /**
+     * The default value for the 'enableMessageUserJoined' setting.
+     */
+    public const DEFAULT_ENABLE_MESSAGE_USER_JOINED = true;
+
+    /**
+     * The key for the 'enableMessageUserJoined' setting.
+     */
+    public const SETTING_ENABLE_MESSAGE_USER_JOINED = 'enableMessageUserJoined';
+
     /**
      * @inheritdoc
      */
@@ -22,4 +33,26 @@ public static function type(): int
     {
         return self::TYPE_USER_JOINED;
     }
+
+    /**
+     * Checks if the MessageUserJoined state is enabled.
+     *
+     * @param array $settings The settings array, where the 'enableMessageUserJoined' setting is stored.
+     * @return bool
+     */
+    public static function isEnabled(array $settings): bool
+    {
+        return $settings[self::SETTING_ENABLE_MESSAGE_USER_JOINED] ?? self::DEFAULT_ENABLE_MESSAGE_USER_JOINED;
+    }
+
+    /**
+     * Checks if the MessageUserJoined state is disabled.
+     *
+     * @param array $settings The settings array, where the 'enableMessageUserJoined' setting is stored.
+     * @return bool
+     */
+    public static function isDisabled(array $settings): bool
+    {
+        return !self::isEnabled($settings);
+    }
 }
diff --git a/models/states/MessageUserLeft.php b/models/states/MessageUserLeft.php
index b7710ea0..f4318138 100644
--- a/models/states/MessageUserLeft.php
+++ b/models/states/MessageUserLeft.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
@@ -15,6 +16,16 @@
  */
 class MessageUserLeft extends AbstractMessageState
 {
+    /**
+     * The default value for the 'enableMessageUserLeft' setting.
+     */
+    public const DEFAULT_ENABLE_MESSAGE_USER_LEFT = true;
+
+    /**
+     * The key for the 'enableMessageUserLeft' setting.
+     */
+    public const SETTING_ENABLE_MESSAGE_USER_LEFT = 'enableMessageUserLeft';
+
     /**
      * @inheritdoc
      */
@@ -22,4 +33,26 @@ public static function type(): int
     {
         return self::TYPE_USER_LEFT;
     }
+
+    /**
+     * Checks if the MessageUserLeft state is enabled.
+     *
+     * @param array $settings The settings array, where the 'enableMessageUserLeft' setting is stored.
+     * @return bool
+     */
+    public static function isEnabled(array $settings): bool
+    {
+        return $settings[self::SETTING_ENABLE_MESSAGE_USER_LEFT] ?? self::DEFAULT_ENABLE_MESSAGE_USER_LEFT;
+    }
+
+    /**
+     * Checks if the MessageUserLeft state is disabled.
+     *
+     * @param array $settings The settings array, where the 'enableMessageUserLeft' setting is stored.
+     * @return bool
+     */
+    public static function isDisabled(array $settings): bool
+    {
+        return !self::isEnabled($settings);
+    }
 }
diff --git a/notifications/ConversationNotification.php b/notifications/ConversationNotification.php
index 550135b4..9c56f69e 100644
--- a/notifications/ConversationNotification.php
+++ b/notifications/ConversationNotification.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG
diff --git a/notifications/ConversationNotificationCategory.php b/notifications/ConversationNotificationCategory.php
index b40be7de..f0bc05a8 100644
--- a/notifications/ConversationNotificationCategory.php
+++ b/notifications/ConversationNotificationCategory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG
diff --git a/notifications/MailNotification.php b/notifications/MailNotification.php
index 0198afd8..26123d6b 100644
--- a/notifications/MailNotification.php
+++ b/notifications/MailNotification.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG
diff --git a/search/SearchProvider.php b/search/SearchProvider.php
index 5f4c1a3c..5e5024ed 100644
--- a/search/SearchProvider.php
+++ b/search/SearchProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) HumHub GmbH & Co. KG
diff --git a/search/SearchRecord.php b/search/SearchRecord.php
index 46ecf9a9..d6c1dd49 100644
--- a/search/SearchRecord.php
+++ b/search/SearchRecord.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) HumHub GmbH & Co. KG
diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index 8ece2970..7b3d99a9 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2015 HumHub GmbH & Co. KG
diff --git a/tests/codeception/acceptance/_bootstrap.php b/tests/codeception/acceptance/_bootstrap.php
index 9e54876d..1fe32516 100644
--- a/tests/codeception/acceptance/_bootstrap.php
+++ b/tests/codeception/acceptance/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php
diff --git a/tests/codeception/api/_bootstrap.php b/tests/codeception/api/_bootstrap.php
index 9e54876d..1fe32516 100644
--- a/tests/codeception/api/_bootstrap.php
+++ b/tests/codeception/api/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php
diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/functional/_bootstrap.php
index d52c411e..666f31a1 100644
--- a/tests/codeception/functional/_bootstrap.php
+++ b/tests/codeception/functional/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php
diff --git a/tests/codeception/unit/_bootstrap.php b/tests/codeception/unit/_bootstrap.php
index 53d9a03f..00c4b556 100644
--- a/tests/codeception/unit/_bootstrap.php
+++ b/tests/codeception/unit/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * The bootstrapping of unit tests is done by yii\codeception\DbTestCase or tests\codeception\_support\HumHubDbTestCase
  * These classes will automatically load the config from @tests/codeception/config/unit.php
diff --git a/tests/config/api.php b/tests/config/api.php
index ae7fa3f7..9ec3ba32 100644
--- a/tests/config/api.php
+++ b/tests/config/api.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Here you can overwrite your functional humhub config. The default config resiedes in @humhubTests/codeception/config/config.php
  */
diff --git a/tests/config/common.php b/tests/config/common.php
index be182432..5a4b80d8 100644
--- a/tests/config/common.php
+++ b/tests/config/common.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This config is shared by all suites (unit/functional/acceptance) and can be overwritten by a suite config (e.g. functional.php)
  */
diff --git a/tests/config/functional.php b/tests/config/functional.php
index ffdc54cc..956e139d 100644
--- a/tests/config/functional.php
+++ b/tests/config/functional.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Here you can overwrite the default config for the functional suite. The default config resides in @humhubTests/codeception/config/config.php
  */
diff --git a/tests/config/unit.php b/tests/config/unit.php
index ae7fa3f7..9ec3ba32 100644
--- a/tests/config/unit.php
+++ b/tests/config/unit.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Here you can overwrite your functional humhub config. The default config resiedes in @humhubTests/codeception/config/config.php
  */
diff --git a/views/config/index.php b/views/config/index.php
index 378e99c6..034b22ff 100644
--- a/views/config/index.php
+++ b/views/config/index.php
@@ -1,25 +1,20 @@
 <?php
 
 use humhub\libs\Html;
-use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\widgets\Button;
+use humhub\modules\ui\form\widgets\ActiveForm;
 
 /* @var $model \humhub\modules\mail\models\Config */
-?>
 
+?>
 <div class="panel panel-default">
-
     <div class="panel-heading"><?= Yii::t('MailModule.base', '<strong>Messenger</strong> module configuration'); ?></div>
-
     <div class="panel-body">
         <?php $form = ActiveForm::begin(['id' => 'configure-form']); ?>
-
             <?= $form->field($model, 'showInTopNav')->checkbox(); ?>
-
             <hr>
             <?= $form->field($model, 'userConversationRestriction')->textInput(['type' => 'number']); ?>
             <?php // $form->field($model, 'userMessageRestriction')->textInput(['type' => 'number']); ?>
-
             <hr>
             <?= $form->field($model, 'newUserRestrictionEnabled')->checkbox(['id' => 'newUserCheckbox']); ?>
             <div id="newUserRestriction">
@@ -27,16 +22,16 @@
                 <?= $form->field($model, 'newUserConversationRestriction')->textInput(['type' => 'number']); ?>
                 <?php // $form->field($model, 'newUserMessageRestriction')->textInput(['type' => 'number']); ?>
             </div>
-
+            <hr>
+            <?= $form->field($model, 'enableMessageUserJoined')->checkbox(); ?>
+            <?= $form->field($model, 'enableMessageUserLeft')->checkbox(); ?>
             <div class="alert alert-info">
                 <i class="fa fa-info-circle"></i> <?= Yii::t('MailModule.base', 'Leave fields blank in order to disable a restriction.') ?>
             </div>
-
         <?= Button::save()->submit() ?>
         <?php ActiveForm::end(); ?>
     </div>
 </div>
-
 <?= Html::script(<<<JS
     function checkNewUserFields()
     {
@@ -47,9 +42,7 @@ function checkNewUserFields()
             $('#newUserRestriction').show();
         }
     }
-
     checkNewUserFields();
-
     $('#newUserCheckbox').on('change', function() {
         checkNewUserFields();
     })
diff --git a/widgets/ConversationDateBadge.php b/widgets/ConversationDateBadge.php
index b907ddf3..07d43235 100644
--- a/widgets/ConversationDateBadge.php
+++ b/widgets/ConversationDateBadge.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
diff --git a/widgets/ConversationEntry.php b/widgets/ConversationEntry.php
index 0bead0b2..d0dc1eb9 100644
--- a/widgets/ConversationEntry.php
+++ b/widgets/ConversationEntry.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: kingb
diff --git a/widgets/ConversationEntryMenu.php b/widgets/ConversationEntryMenu.php
index 23ad674f..ee117cb4 100644
--- a/widgets/ConversationEntryMenu.php
+++ b/widgets/ConversationEntryMenu.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
diff --git a/widgets/ConversationStateBadge.php b/widgets/ConversationStateBadge.php
index 802995ee..ddfaa34a 100644
--- a/widgets/ConversationStateBadge.php
+++ b/widgets/ConversationStateBadge.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
@@ -44,16 +45,23 @@ protected function getOptions(): array
 
     protected function renderInfoText(): ?string
     {
+        $config = new \humhub\modules\mail\models\Config();
+
         switch ($this->entry->type) {
             case AbstractMessageEntry::TYPE_USER_JOINED:
-                return $this->isOwn()
-                    ? Yii::t('MailModule.base', 'You joined the conversation.')
-                    : Yii::t('MailModule.base', '{username} joined the conversation.', ['username' => $this->username]);
-
+                if ($config->enableMessageUserJoined) {
+                    return $this->isOwn()
+                        ? Yii::t('MailModule.base', 'You joined the conversation.')
+                        : Yii::t('MailModule.base', '{username} joined the conversation.', ['username' => $this->username]);
+                }
+                break;
             case AbstractMessageEntry::TYPE_USER_LEFT:
-                return $this->isOwn()
-                    ? Yii::t('MailModule.base', 'You left the conversation.')
-                    : Yii::t('MailModule.base', '{username} left the conversation.', ['username' => $this->username]);
+                if ($config->enableMessageUserLeft) {
+                    return $this->isOwn()
+                        ? Yii::t('MailModule.base', 'You left the conversation.')
+                        : Yii::t('MailModule.base', '{username} left the conversation.', ['username' => $this->username]);
+                }
+                break;
         }
 
         return null;
diff --git a/widgets/ConversationView.php b/widgets/ConversationView.php
index a291d45d..ce69bc61 100644
--- a/widgets/ConversationView.php
+++ b/widgets/ConversationView.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: kingb
diff --git a/widgets/InboxMessagePreview.php b/widgets/InboxMessagePreview.php
index c0cd6ff2..c85ec1d2 100644
--- a/widgets/InboxMessagePreview.php
+++ b/widgets/InboxMessagePreview.php
@@ -97,16 +97,27 @@ private function getMessageTitle(): string
 
     public function getMessagePreview(): string
     {
+        // Retrieve the configuration module
+        $config = new \humhub\modules\mail\models\Config();
+
         switch ($this->getLastEntry()->type) {
             case AbstractMessageEntry::TYPE_USER_JOINED:
-                return $this->isOwnLastEntry()
-                    ? Yii::t('MailModule.base', 'You joined the conversation.')
-                    : Yii::t('MailModule.base', '{username} joined the conversation.', ['username' => $this->getUsername()]);
+                // Check if showing user joined message is enabled
+                if ($config->enableMessageUserJoined) {
+                    return $this->isOwnLastEntry()
+                        ? Yii::t('MailModule.base', 'You joined the conversation.')
+                        : Yii::t('MailModule.base', '{username} joined the conversation.', ['username' => $this->getUsername()]);
+                }
+                break;
 
             case AbstractMessageEntry::TYPE_USER_LEFT:
-                return $this->isOwnLastEntry()
-                    ? Yii::t('MailModule.base', 'You left the conversation.')
-                    : Yii::t('MailModule.base', '{username} left the conversation.', ['username' => $this->getUsername()]);
+                // Check if showing user left message is enabled
+                if ($config->enableMessageUserLeft) {
+                    return $this->isOwnLastEntry()
+                        ? Yii::t('MailModule.base', 'You left the conversation.')
+                        : Yii::t('MailModule.base', '{username} left the conversation.', ['username' => $this->getUsername()]);
+                }
+                break;
         }
 
         if ($this->isGroupChat()) {
diff --git a/widgets/MailRichtextEditor.php b/widgets/MailRichtextEditor.php
index d567a489..a8861819 100644
--- a/widgets/MailRichtextEditor.php
+++ b/widgets/MailRichtextEditor.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2019 HumHub GmbH & Co. KG
diff --git a/widgets/MessageEntryTime.php b/widgets/MessageEntryTime.php
index cd303ed1..3b7ba549 100644
--- a/widgets/MessageEntryTime.php
+++ b/widgets/MessageEntryTime.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
diff --git a/widgets/PinLink.php b/widgets/PinLink.php
index eeae056f..db5ad33c 100644
--- a/widgets/PinLink.php
+++ b/widgets/PinLink.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) HumHub GmbH & Co. KG