diff --git a/includes/ApprovedRevsHooks.php b/includes/ApprovedRevsHooks.php
index 40057e5..2c3f6f4 100644
--- a/includes/ApprovedRevsHooks.php
+++ b/includes/ApprovedRevsHooks.php
@@ -672,12 +672,13 @@ class ApprovedRevsHooks {
 		if ( ApprovedRevs::checkPermission( $user, $title, "viewapprover" ) ) {
 			$revisionUser = ApprovedRevs::getRevApprover( $title );
 			if ( $revisionUser ) {
-				$text .= Xml::openElement( 'span', [ 'class' => 'approvingUser' ] ) .
-					wfMessage(
-						'approvedrevs-approver',
+				$text .= Html::rawElement(
+					'span',
+					[ 'class' => 'approvingUser' ],
+					wfMessage( 'approvedrevs-approver' )->rawParams(
 						Linker::userLink( $revisionUser->getId(), $revisionUser->getName() )
-					)->text() .
-					Xml::closeElement( 'span' );
+					)->escaped()
+				);
 			}
 		}
 
@@ -1226,7 +1227,7 @@ class ApprovedRevsHooks {
 			return;
 		}
 
-		$text = wfMessage( 'approvedrevs-noapprovedrevision' )->text();
+		$text = wfMessage( 'approvedrevs-noapprovedrevision' )->escaped();
 
 		$context = $article->getContext();
 		$out = $context->getOutput();
@@ -1312,7 +1313,7 @@ class ApprovedRevsHooks {
 			$rowClass .= "approved-revision";
 
 			$pattern = "/<td[^>]+filehistory-selected+[^>]+>/";
-			$replace = "$0 &#9733; " . wfMessage( 'approvedrevs-approvedrevision' )->text() . "<br />";
+			$replace = "$0 &#9733; " . wfMessage( 'approvedrevs-approvedrevision' )->escaped() . "<br />";
 			$s = preg_replace( $pattern, $replace, $s );
 		}
 
diff --git a/includes/specials/SpecialApprovedRevs.php b/includes/specials/SpecialApprovedRevs.php
index 039b903..211a6d8 100644
--- a/includes/specials/SpecialApprovedRevs.php
+++ b/includes/specials/SpecialApprovedRevs.php
@@ -1,7 +1,7 @@
 <?php
 
 use MediaWiki\Html\Html;
-use MediaWiki\Lineker\Linker;
+use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
 
@@ -77,7 +77,7 @@ class SpecialApprovedRevs extends QueryPage {
 			}
 		}
 
-		$navLine = $this->msg( 'approvedrevs-view' )->text() . ' ' . implode( ' | ', $navLinks );
+		$navLine = $this->msg( 'approvedrevs-view' )->escaped() . ' ' . implode( ' | ', $navLinks );
 		$header = Xml::tags( 'p', null, $navLine ) . "\n";
 
 		return Xml::tags(
@@ -218,14 +218,15 @@ class SpecialApprovedRevs extends QueryPage {
 				$date = $lang->date( $timestampInteger, true );
 				$time = $lang->time( $timestampInteger, true );
 				$userLink = Linker::userLink( $result->log_user, $result->log_user_name );
-				$additionalInfo .= ', ' . $this->msg(
-					'approvedrevs-approvedby',
-					$userLink,
-					$timestamp,
-					$result->log_user_name,
-					$date,
-					$time
-				)->text();
+				$additionalInfo .= ', ' . $this->msg( 'approvedrevs-approvedby' )
+					->rawParams( $userLink )
+					->params(
+						$timestamp,
+						$result->log_user_name,
+						$date,
+						$time
+					)
+					->escaped();
 			}
 
 			return "$pageLink ($additionalInfo)";
@@ -338,14 +339,15 @@ class SpecialApprovedRevs extends QueryPage {
 				$date = $lang->date( $timestampInteger, true );
 				$time = $lang->time( $timestampInteger, true );
 				$userLink = Linker::userLink( $result->log_user, $result->log_user_name );
-				$additionalInfo .= ', ' . $this->msg(
-					'approvedrevs-approvedby',
-					$userLink,
-					$timestamp,
-					$result->log_user_name,
-					$date,
-					$time
-				)->text();
+				$additionalInfo .= ', ' . $this->msg( 'approvedrevs-approvedby' )
+					->rawParams( $userLink )
+					->params(
+						$timestamp,
+						$result->log_user_name,
+						$date,
+						$time
+					)
+					->escaped();
 			}
 
 			return "$pageLink ($additionalInfo)";