diff --git src/bp-activity/bp-activity-filters.php src/bp-activity/bp-activity-filters.php
index db71e25b1..189ef2599 100644
--- src/bp-activity/bp-activity-filters.php
+++ src/bp-activity/bp-activity-filters.php
@@ -202,36 +202,6 @@ function bp_activity_check_blacklist_keys( $activity ) {
  * @return string $content Filtered activity content.
  */
 function bp_activity_filter_kses( $content ) {
-	global $allowedtags;
-
-	$activity_allowedtags = $allowedtags;
-	$activity_allowedtags['a']['aria-label']      = array();
-	$activity_allowedtags['a']['class']           = array();
-	$activity_allowedtags['a']['data-bp-tooltip'] = array();
-	$activity_allowedtags['a']['id']              = array();
-	$activity_allowedtags['a']['rel']             = array();
-	$activity_allowedtags['a']['title']           = array();
-
-	$activity_allowedtags['b']    = array();
-	$activity_allowedtags['code'] = array();
-	$activity_allowedtags['i']    = array();
-
-	$activity_allowedtags['img']           = array();
-	$activity_allowedtags['img']['src']    = array();
-	$activity_allowedtags['img']['alt']    = array();
-	$activity_allowedtags['img']['width']  = array();
-	$activity_allowedtags['img']['height'] = array();
-	$activity_allowedtags['img']['class']  = array();
-	$activity_allowedtags['img']['id']     = array();
-
-	$activity_allowedtags['span']                   = array();
-	$activity_allowedtags['span']['class']          = array();
-	$activity_allowedtags['span']['data-livestamp'] = array();
-
-	$activity_allowedtags['ul'] = array();
-	$activity_allowedtags['ol'] = array();
-	$activity_allowedtags['li'] = array();
-
 	/**
 	 * Filters the allowed HTML tags for BuddyPress Activity content.
 	 *
@@ -239,7 +209,7 @@ function bp_activity_filter_kses( $content ) {
 	 *
 	 * @param array $value Array of allowed HTML tags and attributes.
 	 */
-	$activity_allowedtags = apply_filters( 'bp_activity_allowed_tags', $activity_allowedtags );
+	$activity_allowedtags = apply_filters( 'bp_activity_allowed_tags', bp_get_allowedtags() );
 	return wp_kses( $content, $activity_allowedtags );
 }
 
diff --git src/bp-core/bp-core-functions.php src/bp-core/bp-core-functions.php
index 570d2b3b2..821a12205 100644
--- src/bp-core/bp-core-functions.php
+++ src/bp-core/bp-core-functions.php
@@ -3803,3 +3803,40 @@ function bp_email_get_unsubscribe_type_schema() {
 	 */
 	return (array) apply_filters( 'bp_email_get_unsubscribe_type_schema', $emails );
 }
+
+/**
+ * Get BuddyPress content allowed tags.
+ *
+ * @since  3.0.0
+ *
+ * @global array $allowedtags KSES allowed HTML elements.
+ * @return array              BuddyPress content allowed tags.
+ */
+function bp_get_allowedtags() {
+	global $allowedtags;
+
+	return array_merge_recursive( $allowedtags, array(
+		'a' => array(
+			'aria-label'      => array(),
+			'class'           => array(),
+			'data-bp-tooltip' => array(),
+			'id'              => array(),
+			'rel'             => array(),
+		),
+		'img' => array(
+			'src'    => array(),
+			'alt'    => array(),
+			'width'  => array(),
+			'height' => array(),
+			'class'  => array(),
+			'id'     => array(),
+		),
+		'span'=> array(
+			'class'          => array(),
+			'data-livestamp' => array(),
+		),
+		'ul' => array(),
+		'ol' => array(),
+		'li' => array(),
+	) );
+}
diff --git src/bp-messages/bp-messages-filters.php src/bp-messages/bp-messages-filters.php
index 8b3404bc2..05ca3eee3 100644
--- src/bp-messages/bp-messages-filters.php
+++ src/bp-messages/bp-messages-filters.php
@@ -18,16 +18,15 @@ add_filter( 'bp_get_message_thread_subject',        'wp_filter_kses', 1 );
 add_filter( 'bp_get_message_thread_excerpt',        'wp_filter_kses', 1 );
 add_filter( 'bp_get_messages_subject_value',        'wp_filter_kses', 1 );
 add_filter( 'bp_get_messages_content_value',        'wp_filter_kses', 1 );
-add_filter( 'bp_get_the_thread_message_content',    'wp_filter_kses', 1 );
-
-add_filter( 'messages_message_content_before_save', 'wp_filter_kses', 1 );
 add_filter( 'messages_message_subject_before_save', 'wp_filter_kses', 1 );
-add_filter( 'messages_notice_message_before_save',  'wp_filter_kses', 1 );
 add_filter( 'messages_notice_subject_before_save',  'wp_filter_kses', 1 );
-
-add_filter( 'bp_get_the_thread_message_content',    'wp_filter_kses', 1 );
 add_filter( 'bp_get_the_thread_subject',            'wp_filter_kses', 1 );
 
+add_filter( 'bp_get_the_thread_message_content',    'bp_messages_filter_kses', 1 );
+add_filter( 'messages_message_content_before_save', 'bp_messages_filter_kses', 1 );
+add_filter( 'messages_notice_message_before_save',  'bp_messages_filter_kses', 1 );
+add_filter( 'bp_get_message_thread_content',        'bp_messages_filter_kses', 1 );
+
 add_filter( 'messages_message_content_before_save', 'force_balance_tags' );
 add_filter( 'messages_message_subject_before_save', 'force_balance_tags' );
 add_filter( 'messages_notice_message_before_save',  'force_balance_tags' );
@@ -45,34 +44,40 @@ add_filter( 'bp_get_message_notice_text',        'wptexturize' );
 add_filter( 'bp_get_message_thread_subject',     'wptexturize' );
 add_filter( 'bp_get_message_thread_excerpt',     'wptexturize' );
 add_filter( 'bp_get_the_thread_message_content', 'wptexturize' );
+add_filter( 'bp_get_message_thread_content',     'wptexturize' );
 
 add_filter( 'bp_get_message_notice_subject',     'convert_smilies', 2 );
 add_filter( 'bp_get_message_notice_text',        'convert_smilies', 2 );
 add_filter( 'bp_get_message_thread_subject',     'convert_smilies', 2 );
 add_filter( 'bp_get_message_thread_excerpt',     'convert_smilies', 2 );
 add_filter( 'bp_get_the_thread_message_content', 'convert_smilies', 2 );
+add_filter( 'bp_get_message_thread_content',     'convert_smilies', 2 );
 
 add_filter( 'bp_get_message_notice_subject',     'convert_chars' );
 add_filter( 'bp_get_message_notice_text',        'convert_chars' );
 add_filter( 'bp_get_message_thread_subject',     'convert_chars' );
 add_filter( 'bp_get_message_thread_excerpt',     'convert_chars' );
 add_filter( 'bp_get_the_thread_message_content', 'convert_chars' );
+add_filter( 'bp_get_message_thread_content',     'convert_chars' );
 
 add_filter( 'bp_get_message_notice_text',        'make_clickable', 9 );
 add_filter( 'bp_get_the_thread_message_content', 'make_clickable', 9 );
+add_filter( 'bp_get_message_thread_content',     'make_clickable', 9 );
 
 add_filter( 'bp_get_message_notice_text',        'wpautop' );
 add_filter( 'bp_get_the_thread_message_content', 'wpautop' );
+add_filter( 'bp_get_message_thread_content',     'wpautop' );
 
-add_filter( 'bp_get_message_notice_subject',          'stripslashes_deep' );
-add_filter( 'bp_get_message_notice_text',             'stripslashes_deep' );
-add_filter( 'bp_get_message_thread_subject',          'stripslashes_deep' );
-add_filter( 'bp_get_message_thread_excerpt',          'stripslashes_deep' );
-add_filter( 'bp_get_message_get_recipient_usernames', 'stripslashes_deep' );
-add_filter( 'bp_get_messages_subject_value',          'stripslashes_deep' );
-add_filter( 'bp_get_messages_content_value',          'stripslashes_deep' );
-add_filter( 'bp_get_the_thread_message_content',      'stripslashes_deep' );
-add_filter( 'bp_get_the_thread_subject',              'stripslashes_deep' );
+add_filter( 'bp_get_message_notice_subject',          'stripslashes_deep'    );
+add_filter( 'bp_get_message_notice_text',             'stripslashes_deep'    );
+add_filter( 'bp_get_message_thread_subject',          'stripslashes_deep'    );
+add_filter( 'bp_get_message_thread_excerpt',          'stripslashes_deep'    );
+add_filter( 'bp_get_message_get_recipient_usernames', 'stripslashes_deep'    );
+add_filter( 'bp_get_messages_subject_value',          'stripslashes_deep'    );
+add_filter( 'bp_get_messages_content_value',          'stripslashes_deep'    );
+add_filter( 'bp_get_the_thread_message_content',      'stripslashes_deep'    );
+add_filter( 'bp_get_the_thread_subject',              'stripslashes_deep'    );
+add_filter( 'bp_get_message_thread_content',          'stripslashes_deep', 1 );
 
 /**
  * Enforce limitations on viewing private message contents
@@ -98,3 +103,26 @@ function bp_messages_enforce_current_user( $args = array() ) {
 	return $args;
 }
 add_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_enforce_current_user', 5 );
+
+/**
+ * Custom kses filtering for message content.
+ *
+ * @since 3.0.0
+ *
+ * @param string $content The message content.
+ * @return string         The filtered message content.
+ */
+function bp_messages_filter_kses( $content ) {
+	$messages_allowedtags      = bp_get_allowedtags();
+	$messages_allowedtags['p'] = array();
+
+	/**
+	 * Filters the allowed HTML tags for BuddyPress Messages content.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param array $value Array of allowed HTML tags and attributes.
+	 */
+	$messages_allowedtags = apply_filters( 'bp_messages_allowed_tags', $messages_allowedtags );
+	return wp_kses( $content, $messages_allowedtags );
+}
diff --git src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php
index a5eade58f..5e877b442 100644
--- src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php
+++ src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php
@@ -41,8 +41,8 @@
 
 <script type="text/html" id="tmpl-bp-messages-editor">
 	<?php
-	// Temporarily filter the editor
-	add_filter( 'mce_buttons', 'bp_nouveau_mce_buttons', 10, 1 );
+	// Add a temporary filter on editor buttons
+	add_filter( 'mce_buttons', 'bp_nouveau_messages_mce_buttons', 10, 1 );
 
 	wp_editor(
 		'',
@@ -58,8 +58,8 @@
 			'textarea_rows' => 5,
 		)
 	);
-	// Temporarily filter the editor
-	remove_filter( 'mce_buttons', 'bp_nouveau_mce_buttons', 10, 1 );
+	// Remove the temporary filter on editor buttons
+	remove_filter( 'mce_buttons', 'bp_nouveau_messages_mce_buttons', 10, 1 );
 	?>
 </script>
 
diff --git src/bp-templates/bp-nouveau/css/buddypress-rtl.css src/bp-templates/bp-nouveau/css/buddypress-rtl.css
index 8ca16031f..1c867a215 100644
--- src/bp-templates/bp-nouveau/css/buddypress-rtl.css
+++ src/bp-templates/bp-nouveau/css/buddypress-rtl.css
@@ -3064,7 +3064,7 @@ body.register .buddypress-wrap .page ul {
 }
 
 .bp-messages-content #thread-preview .preview-message {
-	clear: both;
+	overflow: hidden;
 }
 
 .bp-messages-content #thread-preview .preview-content {
@@ -3133,7 +3133,7 @@ body.register .buddypress-wrap .page ul {
 }
 
 .bp-messages-content #bp-message-thread-list .message-content {
-	clear: both;
+	overflow: hidden;
 	margin: 1em auto 0;
 	width: 90%;
 }
diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css
index 937c37a67..06ea3d37e 100644
--- src/bp-templates/bp-nouveau/css/buddypress.css
+++ src/bp-templates/bp-nouveau/css/buddypress.css
@@ -3064,7 +3064,7 @@ body.register .buddypress-wrap .page ul {
 }
 
 .bp-messages-content #thread-preview .preview-message {
-	clear: both;
+	overflow: hidden;
 }
 
 .bp-messages-content #thread-preview .preview-content {
@@ -3133,7 +3133,7 @@ body.register .buddypress-wrap .page ul {
 }
 
 .bp-messages-content #bp-message-thread-list .message-content {
-	clear: both;
+	overflow: hidden;
 	margin: 1em auto 0;
 	width: 90%;
 }
diff --git src/bp-templates/bp-nouveau/includes/messages/functions.php src/bp-templates/bp-nouveau/includes/messages/functions.php
index 852637084..5eebdc077 100644
--- src/bp-templates/bp-nouveau/includes/messages/functions.php
+++ src/bp-templates/bp-nouveau/includes/messages/functions.php
@@ -299,14 +299,23 @@ function bp_nouveau_push_sitewide_notices() {
 }
 
 /**
+ * Disable the WP Editor buttons not allowed in messages content.
+ *
  * @since 3.0.0
+ *
+ * @param array $buttons The WP Editor buttons list.
+ * @param array          The filtered WP Editor buttons list.
  */
-function bp_nouveau_mce_buttons( $buttons = array() ) {
+function bp_nouveau_messages_mce_buttons( $buttons = array() ) {
 	$remove_buttons = array(
 		'wp_more',
 		'spellchecker',
 		'wp_adv',
 		'fullscreen',
+		'alignleft',
+		'alignright',
+		'aligncenter',
+		'formatselect',
 	);
 
 	// Remove unused buttons
diff --git src/bp-templates/bp-nouveau/includes/messages/loader.php src/bp-templates/bp-nouveau/includes/messages/loader.php
index f979c5630..3f83163f3 100644
--- src/bp-templates/bp-nouveau/includes/messages/loader.php
+++ src/bp-templates/bp-nouveau/includes/messages/loader.php
@@ -102,21 +102,6 @@ class BP_Nouveau_Messages {
 
 		// Messages
 		add_filter( 'bp_messages_admin_nav', 'bp_nouveau_messages_adjust_admin_nav', 10, 1 );
-
-		remove_filter( 'messages_notice_message_before_save', 'wp_filter_kses', 1 );
-		remove_filter( 'messages_message_content_before_save', 'wp_filter_kses', 1 );
-		remove_filter( 'bp_get_the_thread_message_content', 'wp_filter_kses', 1 );
-
-		add_filter( 'messages_notice_message_before_save', 'wp_filter_post_kses', 1 );
-		add_filter( 'messages_message_content_before_save', 'wp_filter_post_kses', 1 );
-		add_filter( 'bp_get_the_thread_message_content', 'wp_filter_post_kses', 1 );
-		add_filter( 'bp_get_message_thread_content', 'wp_filter_post_kses', 1 );
-		add_filter( 'bp_get_message_thread_content', 'wptexturize' );
-		add_filter( 'bp_get_message_thread_content', 'stripslashes_deep', 1 );
-		add_filter( 'bp_get_message_thread_content', 'convert_smilies', 2 );
-		add_filter( 'bp_get_message_thread_content', 'convert_chars' );
-		add_filter( 'bp_get_message_thread_content', 'make_clickable', 9 );
-		add_filter( 'bp_get_message_thread_content', 'wpautop' );
 	}
 }
 
diff --git src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
index 89747071c..a9a44a599 100644
--- src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
+++ src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
@@ -192,7 +192,7 @@
 		margin-top: $marg-lrg;
 
 		.preview-message {
-			clear: both;
+			overflow: hidden;
 		}
 
 		.preview-content {
@@ -263,7 +263,7 @@
 		}
 
 		.message-content {
-			clear: both;
+			overflow: hidden;
 			margin: 1em auto 0;
 			width: 90%;
 		}