Index: src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php
===================================================================
--- src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php	(revision 11910)
+++ src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php	(working copy)
@@ -72,7 +72,6 @@
 </script>
 
 <script type="text/html" id="tmpl-bp-messages-filters">
-	<li class="user-messages-bulk-actions"></li>
 	<li class="user-messages-search" role="search" data-bp-search="{{data.box}}">
 		<div class="bp-search messages-search">
 			<form action="" method="get" id="user_messages_search_form" class="bp-messages-search-form" data-bp-search="messages">
@@ -87,14 +86,13 @@
 			</form>
 		</div>
 	</li>
+	<li class="user-messages-bulk-actions"></li>
 </script>
 
 <script type="text/html" id="tmpl-bp-bulk-actions">
-	<label for="user_messages_select_all">
-		<input type="checkbox" id="user_messages_select_all" value="1"/>
-		<span class="bp-screen-reader-text"><?php esc_html_e( 'Select All Messages', 'buddypress' ); ?></span>
-	</label>
-<div class="bulk-actions-wrap bp-hide">
+	<input type="checkbox" id="user_messages_select_all" value="1"/>
+	<label for="user_messages_select_all"><span class="bp-screen-reader-text"><?php esc_html_e( 'Select ', 'buddypress' ); ?></span><?php esc_html_e( 'All Messages', 'buddypress' ); ?></label>
+	<div class="bulk-actions-wrap bp-hide">
 		<div class="bulk-actions select-wrap">
 			<label for="user-messages-bulk-actions" class="bp-screen-reader-text">
 				<?php esc_html_e( 'Select bulk action', 'buddypress' ); ?>
@@ -106,7 +104,7 @@
 			</select>
 			<span class="select-arrow" aria-hidden="true"></span>
 		</div>
-		<button class="messages-button bulk-apply" type="submit">
+		<button class="messages-button bulk-apply bp-tooltip" type="submit" data-bp-tooltip="<?php echo esc_attr( 'Apply', 'buddypress' ); ?>">
 			<span class="dashicons dashicons-yes" aria-hidden="true"></span>
 			<span class="bp-screen-reader-text"><?php esc_html_e( 'Apply', 'buddypress' ); ?></span>
 		</button>
@@ -115,10 +113,8 @@
 
 <script type="text/html" id="tmpl-bp-messages-thread">
 	<div class="thread-cb">
-		<label for="bp-message-thread-{{data.id}}">
-			<input class="message-check" type="checkbox" name="message_ids[]" id="bp-message-thread-{{data.id}}" value="{{data.id}}">
-			<span class="bp-screen-reader-text"><?php esc_html_e( 'Select this message', 'buddypress' ); ?></span>
-		</label>
+		<input class="message-check" type="checkbox" name="message_ids[]" id="bp-message-thread-{{data.id}}" value="{{data.id}}">
+		<label for="bp-message-thread-{{data.id}}" class="bp-screen-reader-text"><?php esc_html_e( 'Select this message', 'buddypress' ); ?></label>
 	</div>
 	<div class="thread-from">
 		<a class="user-link" href="{{data.sender_link}}">
Index: src/bp-templates/bp-nouveau/common-styles/_bp_filters.scss
===================================================================
--- src/bp-templates/bp-nouveau/common-styles/_bp_filters.scss	(revision 11910)
+++ src/bp-templates/bp-nouveau/common-styles/_bp_filters.scss	(working copy)
@@ -17,9 +17,8 @@
 
 	.subnav-filters {
 		background: none;
-		overflow: hidden;
 		list-style: none;
-		margin: $marg-med 0;
+		margin: $marg-med 0 0;
 		padding: 0;
 
 		div {
@@ -37,10 +36,12 @@
 				width: 100%;
 			}
 
-			@include medium-max {
+			.messages-search {
+				margin-bottom: 1em;
 
-				.messages-search {
-					clear: both;
+				@include medium-up {
+
+					margin-bottom: 0;
 				}
 			}
 		}
@@ -85,7 +86,14 @@
 
 			.bulk-actions-wrap {
 				border: 1px solid $bp-border-color;
-				float: left;
+
+				&.bp-show {
+					display: inline-block;
+				}
+
+				&.bp-hide {
+					display: none;
+				}
 			}
 
 			.select-wrap {
@@ -92,15 +100,15 @@
 				border: 0;
 			}
 
-			.bulk-actions,
-			label {
+			.bulk-actions {
 				float: left;
 			}
 
 			label {
+				display: inline-block;
+				font-weight: 300;
+				margin-right: 25px;
 				padding: 5px 0;
-				text-align: center;
-				width: 30px;
 			}
 
 			div {
Index: src/bp-templates/bp-nouveau/css/buddypress-rtl.css
===================================================================
--- src/bp-templates/bp-nouveau/css/buddypress-rtl.css	(revision 11910)
+++ src/bp-templates/bp-nouveau/css/buddypress-rtl.css	(working copy)
@@ -636,9 +636,8 @@
 
 .buddypress-wrap .subnav-filters {
 	background: none;
-	overflow: hidden;
 	list-style: none;
-	margin: 15px 0;
+	margin: 15px 0 0;
 	padding: 0;
 }
 
@@ -655,9 +654,13 @@
 	width: 100%;
 }
 
-@media screen and (max-width: 46.8em) {
+.buddypress-wrap .subnav-filters.bp-messages-filters .messages-search {
+	margin-bottom: 1em;
+}
+
+@media screen and (min-width: 46.8em) {
 	.buddypress-wrap .subnav-filters.bp-messages-filters .messages-search {
-		clear: both;
+		margin-bottom: 0;
 	}
 }
 
@@ -702,22 +705,29 @@
 
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions-wrap {
 	border: 1px solid #eee;
-	float: right;
 }
 
+.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions-wrap.bp-show {
+	display: inline-block;
+}
+
+.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions-wrap.bp-hide {
+	display: none;
+}
+
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions .select-wrap {
 	border: 0;
 }
 
-.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions,
-.buddypress-wrap .subnav-filters .user-messages-bulk-actions label {
+.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions {
 	float: right;
 }
 
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions label {
+	display: inline-block;
+	font-weight: 300;
+	margin-left: 25px;
 	padding: 5px 0;
-	text-align: center;
-	width: 30px;
 }
 
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions div select {
@@ -2870,13 +2880,6 @@
 	flex: 1 2 5%;
 }
 
-#message-threads li .thread-cb label {
-	float: right;
-	margin-right: 5px;
-	text-align: center;
-	width: 5%;
-}
-
 #message-threads li .thread-from {
 	-webkit-flex: 1 2 20%;
 	-moz-flex: 1 2 20%;
Index: src/bp-templates/bp-nouveau/css/buddypress.css
===================================================================
--- src/bp-templates/bp-nouveau/css/buddypress.css	(revision 11910)
+++ src/bp-templates/bp-nouveau/css/buddypress.css	(working copy)
@@ -636,9 +636,8 @@
 
 .buddypress-wrap .subnav-filters {
 	background: none;
-	overflow: hidden;
 	list-style: none;
-	margin: 15px 0;
+	margin: 15px 0 0;
 	padding: 0;
 }
 
@@ -655,9 +654,13 @@
 	width: 100%;
 }
 
-@media screen and (max-width: 46.8em) {
+.buddypress-wrap .subnav-filters.bp-messages-filters .messages-search {
+	margin-bottom: 1em;
+}
+
+@media screen and (min-width: 46.8em) {
 	.buddypress-wrap .subnav-filters.bp-messages-filters .messages-search {
-		clear: both;
+		margin-bottom: 0;
 	}
 }
 
@@ -702,22 +705,29 @@
 
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions-wrap {
 	border: 1px solid #eee;
-	float: left;
 }
 
+.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions-wrap.bp-show {
+	display: inline-block;
+}
+
+.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions-wrap.bp-hide {
+	display: none;
+}
+
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions .select-wrap {
 	border: 0;
 }
 
-.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions,
-.buddypress-wrap .subnav-filters .user-messages-bulk-actions label {
+.buddypress-wrap .subnav-filters .user-messages-bulk-actions .bulk-actions {
 	float: left;
 }
 
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions label {
+	display: inline-block;
+	font-weight: 300;
+	margin-right: 25px;
 	padding: 5px 0;
-	text-align: center;
-	width: 30px;
 }
 
 .buddypress-wrap .subnav-filters .user-messages-bulk-actions div select {
@@ -2870,13 +2880,6 @@
 	flex: 1 2 5%;
 }
 
-#message-threads li .thread-cb label {
-	float: left;
-	margin-left: 5px;
-	text-align: center;
-	width: 5%;
-}
-
 #message-threads li .thread-from {
 	-webkit-flex: 1 2 20%;
 	-moz-flex: 1 2 20%;
Index: src/bp-templates/bp-nouveau/js/buddypress-messages.js
===================================================================
--- src/bp-templates/bp-nouveau/js/buddypress-messages.js	(revision 11910)
+++ src/bp-templates/bp-nouveau/js/buddypress-messages.js	(working copy)
@@ -928,7 +928,7 @@
 			var isChecked = $( event.currentTarget ).prop( 'checked' );
 
 			if ( isChecked ) {
-				$( this.el ).find( '.bulk-actions-wrap' ).removeClass( 'bp-hide' );
+				$( this.el ).find( '.bulk-actions-wrap' ).removeClass( 'bp-hide' ).addClass( 'bp-show' );
 			} else {
 				$( this.el ).find( '.bulk-actions-wrap' ).addClass( 'bp-hide' );
 			}
Index: src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
===================================================================
--- src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss	(revision 11910)
+++ src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss	(working copy)
@@ -123,13 +123,6 @@
 
 			@include center-vert();
 			@include box-item-size(1, 2, 5%);
-
-			label {
-				float: left;
-				margin-left: $marg-xsml;
-				text-align: center;
-				width: 5%;
-			}
 		}
 
 		.thread-from {