diff --git a/lib/Notification/NotificationHelper.php b/lib/Notification/NotificationHelper.php
index 2526624d8..5de17fe1f 100644
--- a/lib/Notification/NotificationHelper.php
+++ b/lib/Notification/NotificationHelper.php
@@ -146,7 +146,7 @@ class NotificationHelper {
 				->setDateTime(new DateTime())
 				->setObject('card', (string) $card->getId())
 				->setSubject('card-comment-mentioned', [$card->getTitle(), $boardId, $this->currentUser])
-				->setMessage($comment->getMessage());
+				->setMessage('{message}', ['message' => $comment->getMessage()]);
 			$this->notificationManager->notify($notification);
 		}
 	}
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index e9fad5a3e..2b47e375a 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -127,7 +127,9 @@ class Notifier implements INotifier {
 						]
 					]
 				);
-				$notification->setParsedMessage($notification->getMessage());
+				if ($notification->getMessage() === '{message}') {
+					$notification->setParsedMessage($notification->getMessageParameters()['message']);
+				}
 				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . '');
 				break;
 			case 'board-shared':