Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php	(revision 45063)
+++ wp-admin/includes/file.php	(working copy)
@@ -2376,7 +2376,14 @@
 	/** This filter is documented in wp-includes/functions.php */
 	$expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
 	$expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
+	$email_address   = $request->email;
+	$export_file_url = get_post_meta( $request_id, '_export_file_url', true );
+	$site_name       = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+	$site_url        = home_url();
 
+	/* translators: Personal data export notification email subject. %s: Site title */
+	$subject = sprintf( __( '[%s] Personal Data Export' ), $site_name );
+
 	/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
 		'Howdy,
@@ -2409,11 +2416,6 @@
 	 */
 	$content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id );
 
-	$email_address   = $request->email;
-	$export_file_url = get_post_meta( $request_id, '_export_file_url', true );
-	$site_name       = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-	$site_url        = home_url();
-
 	$content = str_replace( '###EXPIRATION###', $expiration_date, $content );
 	$content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
 	$content = str_replace( '###EMAIL###', $email_address, $content );
@@ -2420,15 +2422,7 @@
 	$content = str_replace( '###SITENAME###', $site_name, $content );
 	$content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
 
-	$mail_success = wp_mail(
-		$email_address,
-		sprintf(
-			/* translators: Personal data export notification email subject. %s: Site title */
-			__( '[%s] Personal Data Export' ),
-			$site_name
-		),
-		$content
-	);
+	$mail_success = wp_mail( $email_address, $subject, $content );
 
 	if ( $switched_locale ) {
 		restore_previous_locale();
Index: wp-admin/includes/misc.php
===================================================================
--- wp-admin/includes/misc.php	(revision 45063)
+++ wp-admin/includes/misc.php	(working copy)
@@ -1239,6 +1239,9 @@
 
 	$switched_locale = switch_to_locale( get_user_locale() );
 
+	/* translators: New admin email address notification email subject. %s: Site title */
+	$subject = sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) );
+
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
 		'Howdy ###USERNAME###,
@@ -1289,8 +1292,7 @@
 	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
 	$content      = str_replace( '###SITEURL###', home_url(), $content );
 
-	/* translators: New admin email address notification email subject. %s: Site title */
-	wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
+	wp_mail( $value, $subject, $content );
 
 	if ( $switched_locale ) {
 		restore_previous_locale();
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 45063)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -583,6 +583,10 @@
 		$email     = $user->user_email;
 		$name      = $user->user_login;
 		$login_url = wp_login_url();
+
+		/* translators: New site notification email subject. %s: Site title */
+		$subject = sprintf( __( '[%s] New WordPress Site' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) );
+
 		/* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
 		$message = sprintf(
 			__(
@@ -608,7 +612,7 @@
 			$login_url
 		);
 
-		@wp_mail( $email, __( 'New WordPress Site' ), $message );
+		@wp_mail( $email, $subject, $message );
 	}
 endif;
 
Index: wp-admin/ms-delete-site.php
===================================================================
--- wp-admin/ms-delete-site.php	(revision 45063)
+++ wp-admin/ms-delete-site.php	(working copy)
@@ -46,6 +46,9 @@
 
 	$switched_locale = switch_to_locale( get_locale() );
 
+	/* translators: Delete site confirmation notification email subject. %s: Site title */
+	$subject = sprintf( __( '[%s] Delete My Site' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) );
+
 	/* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
 	$content = __(
 		"Howdy ###USERNAME###,
@@ -78,7 +81,7 @@
 	$content = str_replace( '###URL_DELETE###', $url_delete, $content );
 	$content = str_replace( '###SITE_NAME###', get_network()->site_name, $content );
 
-	wp_mail( get_option( 'admin_email' ), '[ ' . wp_specialchars_decode( get_option( 'blogname' ) ) . ' ] ' . __( 'Delete My Site' ), $content );
+	wp_mail( get_option( 'admin_email' ), $subject, $content );
 
 	if ( $switched_locale ) {
 		restore_previous_locale();
Index: wp-admin/user-new.php
===================================================================
--- wp-admin/user-new.php	(revision 45063)
+++ wp-admin/user-new.php	(working copy)
@@ -112,6 +112,9 @@
 
 			$switched_locale = switch_to_locale( get_user_locale( $user_details ) );
 
+			/* translators: Joining confirmation notification email subject. %s: Site title */
+			$subject = sprintf( __( '[%s] Joining Confirmation' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) );
+
 			/* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
 			$message = __(
 				'Hi,
@@ -123,8 +126,7 @@
 %4$s'
 			);
 
-			/* translators: Joining confirmation notification email subject. %s: Site title */
-			wp_mail( $new_user_email, sprintf( __( '[%s] Joining Confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
+			wp_mail( $new_user_email, $subject, sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
 
 			if ( $switched_locale ) {
 				restore_previous_locale();
Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 45063)
+++ wp-includes/ms-functions.php	(working copy)
@@ -2596,6 +2596,9 @@
 
 	$switched_locale = switch_to_locale( get_user_locale() );
 
+	/* translators: Email change notification email subject. %s: Network title */
+	$subject = sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) );
+
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
 		'Howdy ###USERNAME###,
@@ -2645,8 +2648,7 @@
 	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
 	$content      = str_replace( '###SITEURL###', network_home_url(), $content );
 
-	/* translators: Email change notification email subject. %s: Network title */
-	wp_mail( $value, sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
+	wp_mail( $value, $subject, $content );
 
 	if ( $switched_locale ) {
 		restore_previous_locale();
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 45063)
+++ wp-includes/user.php	(working copy)
@@ -2761,6 +2761,9 @@
 
 		$sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
+		/* translators: Email change request notification email subject. %s: Site name */
+		$subject = sprintf( __( '[%s] Email Change Request' ), $sitename );
+
 		/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 		$email_text = __(
 			'Howdy ###USERNAME###,
@@ -2809,8 +2812,7 @@
 		$content = str_replace( '###SITENAME###', $sitename, $content );
 		$content = str_replace( '###SITEURL###', home_url(), $content );
 
-		/* translators: New email address notification email subject. %s: Site name */
-		wp_mail( $_POST['email'], sprintf( __( '[%s] Email Change Request' ), $sitename ), $content );
+		wp_mail( $_POST['email'], $subject, $content );
 
 		$_POST['email'] = $current_user->user_email;
 	}