diff --git a/src/bp-messages/classes/class-bp-messages-thread.php b/src/bp-messages/classes/class-bp-messages-thread.php
index c868d554f..ccb8a8ffa 100644
--- a/src/bp-messages/classes/class-bp-messages-thread.php
+++ b/src/bp-messages/classes/class-bp-messages-thread.php
@@ -487,9 +487,13 @@ class BP_Messages_Thread {
 			$type_sql = " AND r.unread_count = 0 ";
 		}
 
+		$bp = buddypress();
 		if ( ! empty( $r['search_terms'] ) ) {
 			$search_terms_like = '%' . bp_esc_like( $r['search_terms'] ) . '%';
-			$search_sql        = $wpdb->prepare( "AND ( subject LIKE %s OR message LIKE %s )", $search_terms_like, $search_terms_like );
+			$search_sql        = $wpdb->prepare( "AND ( subject LIKE %s OR message LIKE %s ", $search_terms_like, $search_terms_like );
+			$search_sql       .= "OR r.thread_id in( SELECT thread_id from {$bp->messages->table_name_recipients} r1 INNER JOIN {$wpdb->users} user ON user.ID = r1.user_id where ";
+			$search_sql       .= $wpdb->prepare( "r1.user_id != %d AND ( user_login like %s or display_name like %s) )", $r['user_id'], $search_terms_like, $search_terms_like );
+			$search_sql       .= ' )';
 		}
 
 		$r['user_id'] = (int) $r['user_id'];
@@ -523,8 +527,6 @@ class BP_Messages_Thread {
 			$meta_query_sql['where'] = $meta_query['where'];
 		}
 
-		$bp = buddypress();
-
 		// Set up SQL array.
 		$sql = array();
 		$sql['select'] = 'SELECT m.thread_id, MAX(m.date_sent) AS date_sent';