diff --git a/i18n/en.json b/i18n/en.json
index 3ee18894..0142f2a2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,7 +27,7 @@
 	"thanks-thank-tooltip-no": "{{GENDER:$1|Cancel}} the thank you notification",
 	"thanks-thank-tooltip-yes": "{{GENDER:$1|Send}} the thank you notification",
 	"thanks-confirmation2": "All thanks are public. {{GENDER:$1|Send}} thanks?",
-	"thanks-thanked-notice": "{{GENDER:$2|You}} thanked $1.",
+	"thanks-thanked-notice": "{{GENDER:$3|You}} thanked {{GENDER:$2|$1}}.",
 	"thanks": "Send thanks",
 	"thanks-submit": "Send thanks",
 	"echo-pref-subscription-edit-thank": "Thanks me for my edit",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 80f553b6..11cf6456 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -38,7 +38,7 @@
 	"thanks-thank-tooltip-no": "Tooltip that appears when a user hovers over the {{msg-mw|confirmable-no}} link, which cancels the thank action.\n\nParameters:\n* $1 - The user sending the thanks. Can be used for GENDER support.",
 	"thanks-thank-tooltip-yes": "Tooltip that appears when a user hovers over the {{msg-mw|confirmable-yes}} link, which confirms the thank action.\n\nParameters:\n* $1 - The user sending the thanks. Can be used for GENDER support.",
 	"thanks-confirmation2": "A confirmation message to make sure the user actually wants to send thanks to another user (publicly).\n\nParameters:\n* $1 - The user sending the thanks. Can be used for GENDER.\nSee also:\n* {{msg-mw|Thanks-confirmation-special-rev}}\n* {{msg-mw|Thanks-confirmation-special-log}}\n* {{msg-mw|Flow-thanks-confirmation-special}}",
-	"thanks-thanked-notice": "Pop-up message that is displayed after a user has thanked another user for their edit.\n\nParameters:\n* $1 - The linked username of the user that was thanked.\n* $2 - The username of the user sending the thanks. Can be used for GENDER support.\n\nSee also:\n* {{msg-mw|Flow-thanks-thanked-notice}}",
+	"thanks-thanked-notice": "Pop-up message that is displayed after a user has thanked another user for their edit.\n\nParameters:\n* $1 - The linked username of the user that was thanked.\n* $2 - The username of the user that was thanked. Can be used for GENDER support.\n* $3 - The username of the user sending the thanks. Can be used for GENDER support.\n\nSee also:\n* {{msg-mw|Flow-thanks-thanked-notice}}",
 	"thanks": "{{doc-special|Thanks|unlisted=1}}\nThe special page contains the form to thank for the edit.\n\n{{Identical|Send thanks}}",
 	"thanks-submit": "The text of the submit button on the Special:Thanks page.\n\n{{Identical|Send thanks}}",
 	"echo-pref-subscription-edit-thank": "Option for getting notifications when someone thanks the user for their edit.\n\nThis is the conclusion of the sentence begun by the header: {{msg-mw|Prefs-echosubscriptions}}.",
@@ -61,7 +61,7 @@
 	"notification-link-text-view-logentry": "Label for button that links to a log entry",
 	"thanks-error-invalidpostid": "Error message that is displayed when the Flow post UUID is not valid",
 	"flow-thanks-confirmation-special": "A confirmation message shown on [[Special:Thanks]] to make sure the user wants to send thanks for a comment (publicly).\n\nSee also:\n* {{msg-mw|Thanks-confirmation-special}}\n* {{msg-mw|Thanks-confirmation2}}",
-	"flow-thanks-thanked-notice": "{{doc-singularthey}}\nMessage displayed after a user has thanked another user for their comment.\n\nParameters:\n* $1 - The linked username of the user that was thanked.\n* $2 - The gender of the user that was thanked.\n* $3 - The user sending the thanks. Can be used for GENDER support.\n\nSee also:\n* {{msg-mw|thanks-thanked-notice}}",
+	"flow-thanks-thanked-notice": "{{doc-singularthey}}\nMessage displayed after a user has thanked another user for their comment.\n\nParameters:\n* $1 - The linked username of the user that was thanked.\n* $2 - The username of the user that was thanked. Can be used for GENDER support.\n* $3 - The user sending the thanks. Can be used for GENDER support.\n\nSee also:\n* {{msg-mw|thanks-thanked-notice}}",
 	"notification-flow-thanks-post-link": "The text of a link to the comment made by the user.\n\nUsed for <code>$2</code> in {{msg-mw|notification-flow-thanks}}. Should have capitalization appropriate for the middle of a sentence.\n\nThis is an object in a sentence so it should be in object case in languages where there is a special object form for words.",
 	"notification-header-flow-thank": "Header text for a notification when a user is thanked for their comment on a Flow board.\n\nParameters:\n* $1 – The username of the user sending the thanks (not suitable for GENDER).\n* $2 – Either unused by the translation, or the thanking user's name for use in GENDER.\n* $3 – The title of the topic the comment belongs to.\n* $4 – The title of the page where the comment is located.\n* $5 – Either unused by the translation, or the username of the user being thanked, for use in GENDER.\n\n{{related|Notification-header-flow}}",
 	"notification-compact-header-flow-thank": "Compact header text for a notification when a user is thanked for their comment on a Flow board.\n\nParameters:\n* $1 – The username of the user sending the thanks (not suitable for GENDER).\n* $2 – Either unused by the translation, or the thanking user's name for use in GENDER.\n* $3 – Either unused by the translation, or the username of the user being thanked, for use in GENDER.\n\n{{related|Notification-header-flow}}",
diff --git a/includes/SpecialThanks.php b/includes/SpecialThanks.php
index 54b87581..43fd92e1 100644
--- a/includes/SpecialThanks.php
+++ b/includes/SpecialThanks.php
@@ -181,14 +181,13 @@ class SpecialThanks extends FormSpecialPage {
 		$link = Linker::userLink( $recipient->getId(), $recipient->getName() );
 
 		if ( in_array( $this->type, [ 'rev', 'log' ] ) ) {
-			$msg = $this->msg( 'thanks-thanked-notice' )
-				->rawParams( $link )
-				->params( $sender->getName() );
+			$msgKey = 'thanks-thanked-notice';
 		} else {
-			$msg = $this->msg( 'flow-thanks-thanked-notice' )
-				->rawParams( $link )
-				->params( $recipient->getName(), $sender->getName() );
+			$msgKey = 'flow-thanks-thanked-notice';
 		}
+		$msg = $this->msg( $msgKey )
+			->rawParams( $link )
+			->params( $recipient->getName(), $sender->getName() );
 		$this->getOutput()->addHTML( $msg->parse() );
 	}