diff --git a/admin/admin_mass_email.php b/admin/admin_mass_email.php
index 9c9611b0..4e4d8221 100644
--- a/admin/admin_mass_email.php
+++ b/admin/admin_mass_email.php
@@ -69,8 +69,8 @@ if (isset($_POST['submit']))
 			$emailer->use_template('admin_send_email');
 
 			$emailer->assign_vars(array(
-				'SUBJECT'    => html_entity_decode($subject),
-				'MESSAGE'    => html_entity_decode($message),
+				'SUBJECT'    => trim(html_entity_decode($subject)),
+				'MESSAGE'    => trim(html_entity_decode($message)),
 			));
 
 			$emailer->send();
@@ -104,4 +104,4 @@ $template->assign_vars(array(
 	'S_GROUP_SELECT' => build_select(POST_GROUPS_URL, $groups),
 ));
 
-print_page('admin_mass_email.tpl', 'admin');
\ No newline at end of file
+print_page('admin_mass_email.tpl', 'admin');