diff --git a/src/bp-core/bp-core-filters.php b/src/bp-core/bp-core-filters.php
index 8d0ac06..a60fa24 100644
--- a/src/bp-core/bp-core-filters.php
+++ b/src/bp-core/bp-core-filters.php
@@ -59,7 +59,6 @@ add_filter( 'bp_email_set_content_html', 'stripslashes', 8 );
 add_filter( 'bp_email_set_content_plaintext', 'wp_strip_all_tags', 6 );
 add_filter( 'bp_email_set_subject', 'sanitize_text_field', 6 );
 
-
 /**
  * Template Compatibility.
  *
diff --git a/tests/phpunit/testcases/core/class-bp-email.php b/tests/phpunit/testcases/core/class-bp-email.php
index 45ab91a..3ae68d9 100644
--- a/tests/phpunit/testcases/core/class-bp-email.php
+++ b/tests/phpunit/testcases/core/class-bp-email.php
@@ -267,4 +267,33 @@ class BP_Tests_Email extends BP_UnitTestCase_Emails {
 
 		$this->assertTrue( $result );
 	}
+
+	public function test_html_entities_are_decoded_in_email_subject() {
+		$text = "It’s pretty <new & magical.";
+		$html = wptexturize( $text );
+
+		$email = new BP_Email( 'activity-at-message' );
+		$email->set_subject( $html )->set_tokens( array( 'poster.name' => 'example' ) );
+
+		$this->assertSame( $text, $email->get_subject() );
+	}
+
+	public function test_html_entities_are_decoded_in_email_recipient_names() {
+		$name = "Test o'Toole";
+		xprofile_set_field_data( 1, $this->u1, $name );
+
+		global $field;
+		$field = new BP_XProfile_ProfileData( 1, $this->u1 );
+		$xprofile_name = apply_filters( 'bp_get_the_profile_field_value', $field->value, $field->type, 1 );
+
+		die(var_dump($xprofile_name, $field          ));
+
+		//$html = wptexturize( $text );
+		$email = new BP_Email( 'activity-at-message' );
+		$email->set_subject( $html )->set_tokens( array( 'poster.name' => 'example' ) );
+		$html = html_entity_decode( $email->get_subject(), ENT_QUOTES );
+
+		$this->assertSame( $text, $html );
+	}
+
 }