From d7aefb384e9e597e7f983cd015434441cf7da6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Mon, 1 Dec 2025 11:43:56 +0000
Subject: [PATCH 1/2] Fix: In mail notifications, use core button for "Reply
 now", to allow auto-contrast
 https://github.com/humhub/humhub-internal/issues/932

---
 docs/CHANGELOG.md           |  1 +
 views/emails/NewMessage.php | 23 ++++++++---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 691fd649..8f3ff6ec 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -9,6 +9,7 @@ Changelog
 - Enh #464: Conversation entry buttons visible on hovering the entry by CSS instead of JS
 - Fix #465: Extra right scrollbar
 - Enh #466: Convert swagger docs to OpenAPI 3.0
+- Fix: In mail notifications, use core button for "Reply now", to allow auto-contrast
 
 3.3.5 (September 30, 2025)
 --------------------------
diff --git a/views/emails/NewMessage.php b/views/emails/NewMessage.php
index 4f64621b..277d714c 100644
--- a/views/emails/NewMessage.php
+++ b/views/emails/NewMessage.php
@@ -6,6 +6,8 @@
 use humhub\modules\mail\models\MessageEntry;
 use humhub\modules\ui\mail\DefaultMailStyle;
 use humhub\modules\user\models\User;
+use humhub\widgets\mails\MailButton;
+use humhub\widgets\mails\MailButtonList;
 
 /* @var $this View */
 /* @var $user User */
@@ -155,21 +157,12 @@
                                     <!--end space height -->
                                     <tr>
                                         <td valign="top" width="auto" align="center">
-                                            <!-- start button -->
-                                            <table border="0" align="center" cellpadding="0" cellspacing="0">
-                                                <tr>
-                                                    <td width="auto"  align="center" valign="middle" height="32" style=" background-color:<?= $this->theme->variable('primary'); ?>;  border-radius:5px; background-clip: padding-box;font-size:14px; font-family: <?= Yii::$app->view->theme->variable('mail-font-family', DefaultMailStyle::DEFAULT_FONT_FAMILY) ?>; text-align:center; color: <?= $this->theme->variable('text-color-contrast') ?>; font-weight: 600; padding: 5px 30px">
-
-                                                        <span style="color: <?= $this->theme->variable('text-color-contrast') ?>; font-weight: 300;">
-                                                            <a href="<?= Url::toMessenger($message, true) ?>" style="text-decoration: none; color: <?= $this->theme->variable('text-color-contrast') ?>; font-weight: 300;">
-                                                                <strong><?= Yii::t('MailModule.base', 'Reply now'); ?></strong>
-                                                            </a>
-                                                        </span>
-                                                    </td>
-
-                                                </tr>
-                                            </table>
-                                            <!-- end button -->
+                                            <?= MailButtonList::widget(['buttons' => [
+                                                MailButton::widget([
+                                                    'url' => Url::toMessenger($message, true),
+                                                    'text' => Yii::t('MailModule.base', 'Reply now'),
+                                                ]),
+                                            ]]) ?>
                                         </td>
 
                                     </tr>

From cb9fcc3984c5a00ca65ff342cef1de4a9baa3ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Mon, 1 Dec 2025 11:45:00 +0000
Subject: [PATCH 2/2] Add PR ID to CHANGELOG

---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8f3ff6ec..b2fee1c4 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -9,7 +9,7 @@ Changelog
 - Enh #464: Conversation entry buttons visible on hovering the entry by CSS instead of JS
 - Fix #465: Extra right scrollbar
 - Enh #466: Convert swagger docs to OpenAPI 3.0
-- Fix: In mail notifications, use core button for "Reply now", to allow auto-contrast
+- Fix #469: In mail notifications, use core button for "Reply now", to allow auto-contrast
 
 3.3.5 (September 30, 2025)
 --------------------------