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 8fa9753e8..466d98ec1 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
@@ -34,8 +34,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(
 		'',
@@ -51,8 +51,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 afeca9358..8f0afc6a0 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 5e7528dce..f838f12fe 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 eb9ad5d0d..09df54607 100644
--- src/bp-templates/bp-nouveau/includes/messages/functions.php
+++ src/bp-templates/bp-nouveau/includes/messages/functions.php
@@ -299,14 +299,62 @@ function bp_nouveau_push_sitewide_notices() {
 }
 
 /**
+ * Custom kses filtering for message content.
+ *
+ * @since 3.0.0
+ *
+ * @param string $content The message content.
+ * @return string         The filtered message content.
+ */
+function bp_nouveau_messages_filter_kses( $content ) {
+	global $allowedtags;
+
+	return wp_kses( $content, array_merge( $allowedtags, array(
+		'a' => array(
+			'aria-label'      => true,
+			'class'           => true,
+			'data-bp-tooltip' => true,
+			'id'              => true,
+			'rel'             => true,
+			'title'           => true,
+		),
+		'img' => array(
+			'src'    => true,
+			'alt'    => true,
+			'width'  => true,
+			'height' => true,
+			'class'  => true,
+			'id'     => true,
+		),
+		'span'=> array(
+			'class'          => true,
+			'data-livestamp' => true,
+		),
+		'p'  => true,
+		'ul' => true,
+		'ol' => true,
+		'li' => true,
+	) ) );
+}
+
+/**
+ * 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..828a430ee 100644
--- src/bp-templates/bp-nouveau/includes/messages/loader.php
+++ src/bp-templates/bp-nouveau/includes/messages/loader.php
@@ -107,10 +107,10 @@ class BP_Nouveau_Messages {
 		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( 'messages_notice_message_before_save', 'bp_nouveau_messages_filter_kses', 1 );
+		add_filter( 'messages_message_content_before_save', 'bp_nouveau_messages_filter_kses', 1 );
+		add_filter( 'bp_get_the_thread_message_content', 'bp_nouveau_messages_filter_kses', 1 );
+		add_filter( 'bp_get_message_thread_content', 'bp_nouveau_messages_filter_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 );
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%;
 		}