Index: src/bp-templates/bp-legacy/js/buddypress.js
===================================================================
--- src/bp-templates/bp-legacy/js/buddypress.js	(revision 9352)
+++ src/bp-templates/bp-legacy/js/buddypress.js	(working copy)
@@ -1366,11 +1366,11 @@
 		var target = jq(event.target),
 			object;
 
-		if ( target.attr('type') === 'submit' ) {
+		if ( target.attr('type') === 'submit' || target.attr('type') === 'button' ) {
 			//var css_id = jq('.item-list-tabs li.selected').attr('id').split( '-' );
 			object = 'messages';
 
-			bp_filter_request( object, jq.cookie('bp-' + object + '-filter'), jq.cookie('bp-' + object + '-scope') , 'div.' + object, target.parent().children('label').children('input').val(), 1, jq.cookie('bp-' + object + '-extras') );
+			bp_filter_request( object, jq.cookie('bp-' + object + '-filter'), jq.cookie('bp-' + object + '-scope') , 'div.' + object, jq('#messages_search').val(), 1, jq.cookie('bp-' + object + '-extras') );
 
 			return false;
 		}