diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index cd72a8748a..a49c3d3b3e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -648,6 +648,7 @@ class acp_board
 				$messenger->anti_abuse_headers($config, $user);
 				$messenger->assign_vars(array(
 					'USERNAME'	=> htmlspecialchars_decode($user->data['username']),
+					'MESSAGE'	=> htmlspecialchars_decode($request->variable('send_test_email_text', '', true)),
 				));
 				$messenger->send(NOTIFY_EMAIL);
 
@@ -1167,6 +1168,7 @@ class acp_board
 	{
 		global $user;
 
-		return '<input class="button2" type="submit" id="' . $key . '" name="' . $key . '" value="' . $user->lang['SEND_TEST_EMAIL'] . '" />';
+		return '<input class="button2" type="submit" id="' . $key . '" name="' . $key . '" value="' . $user->lang('SEND_TEST_EMAIL') . '" />
+				<textarea id="' . $key . '_text" name="' . $key . '_text" placeholder="' . $user->lang('MESSAGE') . '"></textarea>';
 	}
 }
diff --git a/phpBB/language/en/email/test.txt b/phpBB/language/en/email/test.txt
index 91a737248b..d38b24db19 100644
--- a/phpBB/language/en/email/test.txt
+++ b/phpBB/language/en/email/test.txt
@@ -4,6 +4,10 @@ Hello {USERNAME},
 
 Congratulations. If you received this email, phpBB is correctly configured to send emails.
 
+<!-- IF MESSAGE -->
+{MESSAGE}
+
+<!-- ENDIF -->
 In case you require assistance, please visit the phpBB support forums - https://www.phpbb.com/community/
 
 {EMAIL_SIG}