diff --git a/classes/Pref_System.php b/classes/Pref_System.php
index 390dbf183..030a117da 100644
--- a/classes/Pref_System.php
+++ b/classes/Pref_System.php
@@ -17,11 +17,12 @@ class Pref_System extends Handler_Administrative {
 
 		$mailer = new Mailer();
 
-		$rc = $mailer->mail(["to_name" => "",
-			"to_address" => $mail_address,
-			"subject" => __("Test message from tt-rss"),
-			"message" => ("This message confirms that tt-rss can send outgoing email.")
-			]);
+		$rc = $mailer->mail([
+			'to_name' => '',
+			'to_address' => $mail_address,
+			'subject' => __('Test message from tt-rss'),
+			'message' => __('This message confirms that tt-rss can send outgoing email.'),
+		]);
 
 		print json_encode(['rc' => $rc, 'error' => $mailer->error()]);
 	}
diff --git a/messages.pot b/messages.pot
index c537ad8d1..ba7fe2fee 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-11-04 02:48+0000\n"
+"POT-Creation-Date: 2025-11-04 16:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -665,7 +665,7 @@ msgid "Enable digest"
 msgstr ""
 
 #: classes/Pref_Prefs.php:106
-msgid "Send daily digest of new (and unread) headlines to your e-mail address"
+msgid "Send daily digest of new (and unread) headlines to your email address"
 msgstr ""
 
 #: classes/Pref_Prefs.php:107
@@ -827,8 +827,8 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: classes/Pref_Prefs.php:306 js/PrefUsers.js:98
-msgid "E-mail:"
+#: classes/Pref_Prefs.php:306 classes/Handler_Public.php:534 js/PrefUsers.js:98
+msgid "Email:"
 msgstr ""
 
 #: classes/Pref_Prefs.php:314 classes/Pref_Feeds.php:703
@@ -1238,8 +1238,8 @@ msgid "Password recovery"
 msgstr ""
 
 #: classes/Handler_Public.php:519 classes/Handler_Public.php:549
-#: classes/Handler_Public.php:609 classes/Handler_Public.php:727
-#: classes/Handler_Public.php:734 classes/Handler_Public.php:757
+#: classes/Handler_Public.php:609 classes/Handler_Public.php:726
+#: classes/Handler_Public.php:733 classes/Handler_Public.php:756
 #: plugins/bookmarklets/init.php:97 plugins/bookmarklets/init.php:142
 #: plugins/bookmarklets/init.php:160 plugins/bookmarklets/init.php:165
 msgid "Return to Tiny Tiny RSS"
@@ -1257,10 +1257,6 @@ msgstr ""
 msgid "Login:"
 msgstr ""
 
-#: classes/Handler_Public.php:534
-msgid "Email:"
-msgstr ""
-
 #: classes/Handler_Public.php:542
 #, php-format
 msgid "How much is %d + %d:"
@@ -1290,25 +1286,25 @@ msgstr ""
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/Handler_Public.php:689
+#: classes/Handler_Public.php:688
 msgid "Proceed with update?"
 msgstr ""
 
-#: classes/Handler_Public.php:694
+#: classes/Handler_Public.php:693
 msgid "Database Updater"
 msgstr ""
 
-#: classes/Handler_Public.php:707
+#: classes/Handler_Public.php:706
 #, php-format
 msgid "Performing updates to version %d"
 msgstr ""
 
-#: classes/Handler_Public.php:722 classes/Handler_Public.php:749
+#: classes/Handler_Public.php:721 classes/Handler_Public.php:748
 #: js/PrefHelpers.js:417 js/PrefHelpers.js:760
 msgid "Update"
 msgstr ""
 
-#: classes/Handler_Public.php:742
+#: classes/Handler_Public.php:741
 #, php-format
 msgid "Database schema needs update to the latest version (%d to %d)."
 msgstr ""
@@ -1354,7 +1350,7 @@ msgid "(%d days)"
 msgstr ""
 
 #: classes/Pref_Feeds.php:621 js/CommonDialogs.js:500
-msgid "Include in e-mail digest"
+msgid "Include in email digest"
 msgstr ""
 
 #: classes/Pref_Feeds.php:622 js/CommonDialogs.js:501
@@ -1548,6 +1544,10 @@ msgstr[1] ""
 msgid "Test message from tt-rss"
 msgstr ""
 
+#: classes/Pref_System.php:23
+msgid "This message confirms that tt-rss can send outgoing email."
+msgstr ""
+
 #: classes/Pref_System.php:33
 msgid "Task name"
 msgstr ""
@@ -1622,11 +1622,11 @@ msgid "Event log"
 msgstr ""
 
 #: classes/Pref_System.php:202
-msgid "Mail configuration"
+msgid "Email configuration"
 msgstr ""
 
 #: classes/Pref_System.php:213
-msgid "Mail sent."
+msgid "Email sent."
 msgstr ""
 
 #: classes/Pref_System.php:233
@@ -1647,7 +1647,7 @@ msgstr ""
 
 #: classes/Mailer.php:53
 #, php-format
-msgid "Unknown error while sending mail. Hooks tried: %d."
+msgid "Unknown error while sending email. Hooks tried: %d."
 msgstr ""
 
 #: classes/Pref_Users.php:49 classes/Pref_Users.php:239