Index: bp-activity/bp-activity-actions.php
===================================================================
--- bp-activity/bp-activity-actions.php
+++ bp-activity/bp-activity-actions.php
@@ -241,7 +241,7 @@ add_action( 'bp_actions', 'bp_activity_action_remove_favorite' );
 function bp_activity_action_sitewide_feed() {
 	global $bp, $wp_query;
 
-	if ( !bp_is_current_component( 'activity' ) || !bp_is_current_action( 'feed' ) || bp_is_user() || !empty( $bp->groups->current_group ) )
+	if ( !bp_is_activity_component() || !bp_is_current_action( 'feed' ) || bp_is_user() || !empty( $bp->groups->current_group ) )
 		return false;
 
 	$wp_query->is_404 = false;
@@ -255,7 +255,7 @@ add_action( 'bp_actions', 'bp_activity_action_sitewide_feed' );
 function bp_activity_action_personal_feed() {
 	global $bp, $wp_query;
 
-	if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
+	if ( !bp_is_activity_component() || !bp_is_user() || !bp_is_current_action( 'feed' ) )
 		return false;
 
 	$wp_query->is_404 = false;
@@ -269,7 +269,7 @@ add_action( 'bp_actions', 'bp_activity_action_personal_feed' );
 function bp_activity_action_friends_feed() {
 	global $bp, $wp_query;
 
-	if ( !bp_is_active( 'friends' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_friends_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
+	if ( !bp_is_active( 'friends' ) || !bp_is_activity_component() || !bp_is_user() || !bp_is_current_action( bp_get_friends_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
 		return false;
 
 	$wp_query->is_404 = false;
@@ -283,7 +283,7 @@ add_action( 'bp_actions', 'bp_activity_action_friends_feed' );
 function bp_activity_action_my_groups_feed() {
 	global $bp, $wp_query;
 
-	if ( !bp_is_active( 'groups' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_groups_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
+	if ( !bp_is_active( 'groups' ) || !bp_is_activity_component() || !bp_is_user() || !bp_is_current_action( bp_get_groups_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
 		return false;
 
 	$wp_query->is_404 = false;
@@ -297,7 +297,7 @@ add_action( 'bp_actions', 'bp_activity_action_my_groups_feed' );
 function bp_activity_action_mentions_feed() {
 	global $bp, $wp_query;
 
-	if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !bp_is_action_variable( 'feed', 0 ) )
+	if ( !bp_is_activity_component() || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !bp_is_action_variable( 'feed', 0 ) )
 		return false;
 
 	$wp_query->is_404 = false;
@@ -311,7 +311,7 @@ add_action( 'bp_actions', 'bp_activity_action_mentions_feed' );
 function bp_activity_action_favorites_feed() {
 	global $bp, $wp_query;
 
-	if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
+	if ( !bp_is_activity_component() || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
 		return false;
 
 	$wp_query->is_404 = false;
Index: bp-core/bp-core-template.php
===================================================================
--- bp-core/bp-core-template.php
+++ bp-core/bp-core-template.php
@@ -494,9 +494,9 @@ function bp_action_variables() {
  */
 function bp_action_variable( $position = 0 ) {
 	$action_variables = bp_action_variables();
-	
+
 	$action_variable = isset( $action_variables[$position] ) ? $action_variables[$position] : false;
-	
+
 	return apply_filters( 'bp_action_variable', $action_variable, $position );
 }
 
@@ -748,13 +748,13 @@ function bp_is_current_action( $action = '' ) {
  * @param int $position The array key you're testing against. If you don't provide a $position,
  *   the function will return true if the $action_variable is found *anywhere* in the action
  *   variables array.
- * @return bool 
+ * @return bool
  */
 function bp_is_action_variable( $action_variable = '', $position = false ) {
 	$is_action_variable = false;
-	
+
 	if ( false !== $position ) {
-		// When a $position is specified, check that slot in the action_variables array		
+		// When a $position is specified, check that slot in the action_variables array
 		if ( $action_variable ) {
 			$is_action_variable = $action_variable == bp_action_variable( $position );
 		} else {
@@ -766,7 +766,7 @@ function bp_is_action_variable( $action_variable = '', $position = false ) {
 		// When no $position is specified, check the entire array
 		$is_action_variable = in_array( $action_variable, (array)bp_action_variables() );
 	}
-	
+
 	return apply_filters( 'bp_is_action_variable', $is_action_variable, $action_variable, $position );
 }
 
@@ -825,7 +825,7 @@ function bp_is_directory() {
  */
 function bp_is_root_component( $component_name ) {
 	global $bp;
-	
+
 	if ( !isset( $bp->active_components ) )
 		return false;
 
@@ -966,7 +966,7 @@ function bp_is_settings_component() {
 function bp_is_single_activity() {
 	global $bp;
 
-	if ( bp_is_current_component( 'activity' ) && is_numeric( $bp->current_action ) )
+	if ( bp_is_activity_component() && is_numeric( $bp->current_action ) )
 		return true;
 
 	return false;
@@ -997,7 +997,7 @@ function bp_is_user() {
 function bp_is_user_activity() {
 	global $bp;
 
-	if ( bp_is_current_component( 'activity' ) )
+	if ( bp_is_activity_component() && bp_is_user() )
 		return true;
 
 	return false;
@@ -1006,7 +1006,7 @@ function bp_is_user_activity() {
 function bp_is_user_friends_activity() {
 	global $bp;
 
-	if ( bp_is_current_component( 'activity' ) && bp_is_current_action( 'my-friends' ) )
+	if ( bp_is_activity_component() && bp_is_current_action( 'my-friends' ) )
 		return true;
 
 	return false;
@@ -1015,7 +1015,7 @@ function bp_is_user_friends_activity() {
 function bp_is_user_profile() {
 	global $bp;
 
-	if ( bp_is_current_component( 'xprofile' ) || bp_is_current_component( 'profile' ) )
+	if ( bp_is_profile_component() || bp_is_current_component( 'profile' ) )
 		return true;
 
 	return false;
@@ -1024,16 +1024,16 @@ function bp_is_user_profile() {
 function bp_is_user_profile_edit() {
 	global $bp;
 
-	if ( bp_is_current_component( 'xprofile' ) && bp_is_current_action( 'edit' ) )
+	if ( bp_is_profile_component() && bp_is_current_action( 'edit' ) )
 		return true;
-		
+
 	return false;
 }
 
 function bp_is_user_change_avatar() {
 	global $bp;
 
-	if ( bp_is_current_component( 'xprofile' ) && bp_is_current_action( 'change-avatar' ) )
+	if ( bp_is_profile_component() && bp_is_current_action( 'change-avatar' ) )
 		return true;
 
 	return false;
@@ -1042,7 +1042,7 @@ function bp_is_user_change_avatar() {
 function bp_is_user_forums() {
 	global $bp;
 
-	if ( bp_is_current_component( 'forums' ) )
+	if ( bp_is_forums_component() && bp_is_user() )
 		return true;
 
 	return false;
@@ -1051,7 +1051,7 @@ function bp_is_user_forums() {
 function bp_is_user_groups() {
 	global $bp;
 
-	if ( bp_is_current_component( 'groups' ) )
+	if ( bp_is_groups_component() && bp_is_user() )
 		return true;
 
 	return false;
@@ -1060,7 +1060,7 @@ function bp_is_user_groups() {
 function bp_is_user_blogs() {
 	global $bp;
 
-	if ( is_multisite() && bp_is_current_component( 'blogs' ) )
+	if ( bp_is_blogs_component() && bp_is_user() )
 		return true;
 
 	return false;
@@ -1069,7 +1069,7 @@ function bp_is_user_blogs() {
 function bp_is_user_recent_posts() {
 	global $bp;
 
-	if ( is_multisite() && bp_is_current_component( 'blogs' ) && bp_is_current_action( 'recent-posts' ) )
+	if ( bp_is_blogs_component() && bp_is_current_action( 'recent-posts' ) )
 		return true;
 
 	return false;
@@ -1078,7 +1078,7 @@ function bp_is_user_recent_posts() {
 function bp_is_user_recent_commments() {
 	global $bp;
 
-	if ( is_multisite() && bp_is_current_component( 'blogs' ) && bp_is_current_action( 'recent-comments' ) )
+	if ( bp_is_blogs_component() && bp_is_current_action( 'recent-comments' ) )
 		return true;
 
 	return false;
@@ -1086,7 +1086,7 @@ function bp_is_user_recent_commments() {
 
 function bp_is_user_friends() {
 
-	if ( bp_is_current_component( 'friends' ) )
+	if ( bp_is_friends_component() && bp_is_user() )
 		return true;
 
 	return false;
@@ -1095,7 +1095,7 @@ function bp_is_user_friends() {
 function bp_is_user_friend_requests() {
 	global $bp;
 
-	if ( bp_is_current_component( 'friends' ) && bp_is_current_action( 'requests' ) )
+	if ( bp_is_friends_component() && bp_is_current_action( 'requests' ) )
 		return true;
 
 	return false;
@@ -1221,7 +1221,7 @@ function bp_is_group_single() {
 function bp_is_create_blog() {
 	global $bp;
 
-	if ( is_multisite() && bp_is_current_component( 'blogs' ) && bp_is_current_action( 'create' ) )
+	if ( bp_is_blogs_component() && bp_is_current_action( 'create' ) )
 		return true;
 
 	return false;
@@ -1231,7 +1231,7 @@ function bp_is_create_blog() {
 
 function bp_is_user_messages() {
 
-	if ( bp_is_current_component( 'messages' ) )
+	if ( bp_is_messages_component() && bp_is_user() )
 		return true;
 
 	return false;
@@ -1240,7 +1240,7 @@ function bp_is_user_messages() {
 function bp_is_messages_inbox() {
 	global $bp;
 
-	if ( bp_is_current_component( 'messages' ) && ( !bp_current_action() || bp_is_current_action( 'inbox' ) ) )
+	if ( bp_is_messages_component() && ( !bp_current_action() || bp_is_current_action( 'inbox' ) ) )
 		return true;
 
 	return false;
@@ -1249,7 +1249,7 @@ function bp_is_messages_inbox() {
 function bp_is_messages_sentbox() {
 	global $bp;
 
-	if ( bp_is_current_component( 'messages' ) && bp_is_current_action( 'sentbox' ) )
+	if ( bp_is_messages_component() && bp_is_current_action( 'sentbox' ) )
 		return true;
 
 	return false;
@@ -1258,7 +1258,7 @@ function bp_is_messages_sentbox() {
 function bp_is_messages_compose_screen() {
 	global $bp;
 
-	if ( bp_is_current_component( 'messages' ) && bp_is_current_action( 'compose' ) )
+	if ( bp_is_messages_component() && bp_is_current_action( 'compose' ) )
 		return true;
 
 	return false;
@@ -1267,7 +1267,7 @@ function bp_is_messages_compose_screen() {
 function bp_is_notices() {
 	global $bp;
 
-	if ( bp_is_current_component( 'messages' ) && bp_is_current_action( 'notices' ) )
+	if ( bp_is_messages_component() && bp_is_current_action( 'notices' ) )
 		return true;
 
 	return false;
Index: bp-forums/bp-forums-template.php
===================================================================
--- bp-forums/bp-forums-template.php
+++ bp-forums/bp-forums-template.php
@@ -101,7 +101,7 @@ class BP_Forums_Template_Forum {
 		$this->__construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms, $offset, $number );
 	}
 
-	function __construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms, $offset = false, $number = false ) {	
+	function __construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms, $offset = false, $number = false ) {
 		global $bp;
 
 		$this->pag_page     = $page;
@@ -113,7 +113,7 @@ class BP_Forums_Template_Forum {
 		$this->number	    = $number;
 
 		switch ( $type ) {
-			case 'newest': default:				
+			case 'newest': default:
 				$this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'forum_id' => $forum_id, 'filter' => $search_terms, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies, 'offset' => $offset, 'number' => $number ) );
 				break;
 
@@ -152,7 +152,7 @@ class BP_Forums_Template_Forum {
 			} else {
 				$this->total_topic_count = (int)$max;
 			}
-			
+
 			if ( $max ) {
 				if ( $max >= count($this->topics) ) {
 					$this->topic_count = count( $this->topics );
@@ -260,11 +260,11 @@ function bp_has_forum_topics( $args = '' ) {
 	// User filtering
 	if ( !empty( $bp->displayed_user->id ) )
 		$user_id = $bp->displayed_user->id;
-	
+
 	// "Replied" query must be manually modified
 	if ( 'replies' == bp_current_action() ) {
 		$user_id = 0; // User id must be handled manually by the filter, not by BB_Query
-		
+
 		add_filter( 'get_topics_distinct',   'bp_forums_add_replied_distinct_sql', 20 );
 		add_filter( 'get_topics_join', 	     'bp_forums_add_replied_join_sql', 20 );
 		add_filter( 'get_topics_where',      'bp_forums_add_replied_where_sql', 20  );
@@ -285,11 +285,11 @@ function bp_has_forum_topics( $args = '' ) {
 	// If $_GET['fs'] is set, let's auto populate the search_terms var
 	if ( bp_is_directory() && !empty( $_GET['fs'] ) )
 		$search_terms = $_GET['fs'];
-	
+
 	// Get the pagination arguments from $_REQUEST
 	$page     = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : 1;
 	$per_page = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : 20;
-	
+
 	// Unless set otherwise, stickies appear in normal order on the global forum directory
 	if ( bp_is_directory() && bp_is_forums_component() && !bp_forums_enable_global_directory_stickies() )
 		$do_stickies = false;
@@ -315,78 +315,78 @@ function bp_has_forum_topics( $args = '' ) {
 	if ( bp_is_current_action( 'tag' ) && $search_terms = bp_action_variable( 0 ) ) {
 		$type = 'tags';
 	}
-	
+
 	/** Sticky logic ******************************************************************/
-	
+
 	if ( $do_stickies ) {
 		// Fetch the stickies
 		$stickies_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, 0, 0, $max, 'sticky', $search_terms );
-		
+
 		// If stickies are found, try merging them
 		if ( $stickies_template->has_topics() ) {
-		
-			// If stickies are for current $page		
+
+			// If stickies are for current $page
 			$page_start_num = ( ( $page - 1 ) * $per_page ) + 1;
 			$page_end_num 	= $page * $per_page <= $stickies_template->total_topic_count ? $page * $per_page : $stickies_template->total_topic_count;
-			
+
 			// Calculate the number of sticky topics that will be shown on this page
 			if ( $stickies_template->topic_count < $page_start_num ) {
 				$this_page_stickies = 0;
-			} else {			
+			} else {
 				$this_page_stickies = $stickies_template->topic_count - $per_page * floor( $stickies_template->topic_count / $per_page ) * ( $page - 1 ); // Total stickies minus sticky count through this page
-				
+
 				// $this_page_stickies cannot be more than $per_page or less than 0
 				if ( $this_page_stickies > $per_page )
 					$this_page_stickies = $per_page;
 				else if ( $this_page_stickies < 0 )
 					$this_page_stickies = 0;
 			}
-			
+
 			// Calculate the total number of topics that will be shown on this page
 			$this_page_topics = $stickies_template->total_topic_count >= ( $page * $per_page ) ? $per_page : $page_end_num - ( $page_start_num - 1 );
-			
+
 			// If the number of stickies to be shown is less than $per_page, fetch some
 			// non-stickies to fill in the rest
 			if ( $this_page_stickies < $this_page_topics ) {
 				// How many non-stickies do we need?
 				$non_sticky_number = $this_page_topics - $this_page_stickies;
-				
-				// Calculate the non-sticky offset			
+
+				// Calculate the non-sticky offset
 				// How many non-stickies on all pages up to this point?
 				$non_sticky_total = $page_end_num - $stickies_template->topic_count;
-				
+
 				// The offset is the number of total non-stickies, less the number
 				// to be shown on this page
 				$non_sticky_offset = $non_sticky_total - $non_sticky_number;
-				
+
 				// Fetch the non-stickies
 				$forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, 1, $per_page, $max, 'no', $search_terms, $non_sticky_offset, $non_sticky_number );
-				
+
 				// If there are stickies to merge on this page, do it now
 				if ( $this_page_stickies ) {
 					// Correct the topic_count
 					$forum_template->topic_count += (int)$this_page_stickies;
-					
+
 					// Figure out which stickies need to be included
 					$this_page_sticky_topics = array_slice( $stickies_template->topics, 0 - $this_page_stickies );
-					
+
 					// Merge these topics into the forum template
 					$forum_template->topics = array_merge( $this_page_sticky_topics, (array)$forum_template->topics );
 				}
 			} else {
 				// This page has no non-stickies
 				$forum_template = $stickies_template;
-				
+
 				// Adjust the topic count and trim the topics
 				$forum_template->topic_count = $this_page_stickies;
-				$forum_template->topics      = array_slice( $forum_template->topics, $page - 1 );	
+				$forum_template->topics      = array_slice( $forum_template->topics, $page - 1 );
 			}
-					
+
 			// Because we're using a manual offset and number for the topic query, we
 			// must set the page number manually, and recalculate the pagination links
 			$forum_template->pag_num     = $per_page;
 			$forum_template->pag_page    = $page;
-			
+
 			$forum_template->pag_links = paginate_links( array(
 				'base'      => add_query_arg( array( 'p' => '%#%', 'n' => $forum_template->pag_num ) ),
 				'format'    => '',
@@ -396,7 +396,7 @@ function bp_has_forum_topics( $args = '' ) {
 				'next_text' => '&rarr;',
 				'mid_size'  => 1
 			) );
-			
+
 		} else {
 			// Fetch the non-sticky topics if no stickies were found
 			$forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, 'all', $search_terms );
@@ -405,7 +405,7 @@ function bp_has_forum_topics( $args = '' ) {
 		// When skipping the sticky logic, just pull up the forum topics like usual
 		$forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, 'all', $search_terms );
 	}
-		
+
 	return apply_filters( 'bp_has_topics', $forum_template->has_topics(), $forum_template );
 }
 
@@ -864,7 +864,7 @@ function bp_forum_topic_type() {
  */
 function bp_forums_tag_name() {
 	echo bp_get_forums_tag_name();
-}	
+}
 	/**
 	 * Outputs the currently viewed tag name
 	 *
@@ -873,7 +873,7 @@ function bp_forums_tag_name() {
 	 */
 	function bp_get_forums_tag_name() {
 		$tag_name = bp_is_directory() && bp_is_forums_component() ? bp_action_variable( 0 ) : false;
-		
+
 		return apply_filters( 'bp_get_forums_tag_name', $tag_name );
 	}
 
@@ -939,7 +939,7 @@ class BP_Forums_Template_Topic {
 	function BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order ) {
 		$this->__construct( $topic_id, $per_page, $max, $order );
 	}
-		
+
 	function __construct( $topic_id, $per_page, $max, $order ) {
 		global $bp, $current_user, $forum_template;
 
@@ -973,7 +973,7 @@ class BP_Forums_Template_Topic {
 				$this->post_count = count( $this->posts );
 			}
 		}
-		
+
 		// Load topic tags
 		$this->topic_tags = bb_get_topic_tags( $this->topic_id );
 
@@ -1053,9 +1053,9 @@ function bp_has_forum_topic_posts( $args = '' ) {
 	$r = wp_parse_args( $args, $defaults );
 	extract( $r, EXTR_SKIP );
 
-	if ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && bp_is_action_variable( 'topic', 0 ) && bp_action_variable( 1 ) )
+	if ( empty( $topic_id ) && bp_is_groups_component() && bp_is_current_action( 'forum' ) && bp_is_action_variable( 'topic', 0 ) && bp_action_variable( 1 ) )
 		$topic_id = bp_forums_get_topic_id_from_slug( bp_action_variable( 1 ) );
-	elseif ( empty( $topic_id ) && bp_is_current_component( 'forums') && bp_is_current_action( 'topic' ) && bp_action_variable( 0 ) )
+	elseif ( empty( $topic_id ) && bp_is_forums_component() && bp_is_current_action( 'topic' ) && bp_action_variable( 0 ) )
 		$topic_id = bp_forums_get_topic_id_from_slug( bp_action_variable( 0 ) );
 
 	if ( empty( $topic_id ) ) {
@@ -1068,7 +1068,7 @@ function bp_has_forum_topic_posts( $args = '' ) {
 		if ( bp_is_groups_component() && $topic_template->forum_id != groups_get_groupmeta( bp_get_current_group_id(), 'forum_id' ) )
 			return false;
 	}
-	
+
 	return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), $topic_template );
 }
 
@@ -1334,20 +1334,20 @@ function bp_forum_topic_tag_list() {
 	 */
 	function bp_get_forum_topic_tag_list( $format = 'string' ) {
 		global $topic_template;
-		
+
 		$tags_data = !empty( $topic_template->topic_tags ) ? $topic_template->topic_tags : false;
-		
+
 		$tags = array();
-		
+
 		if ( $tags_data ) {
 			foreach( $tags_data as $tag_data ) {
 				$tags[] = $tag_data->name;
 			}
 		}
-		
+
 		if ( 'string' == $format )
 			$tags = implode( ', ', $tags );
-			
+
 		return apply_filters( 'bp_forum_topic_tag_list', $tags, $format );
 	}
 
@@ -1361,12 +1361,12 @@ function bp_forum_topic_tag_list() {
  */
 function bp_forum_topic_has_tags() {
 	global $topic_template;
-	
+
 	$has_tags = false;
-	
+
 	if ( !empty( $topic_template->topic_tags ) )
 		$has_tags = true;
-	
+
 	return apply_filters( 'bp_forum_topic_has_tags', $has_tags );
 }
 
Index: bp-members/bp-members-screens.php
===================================================================
--- bp-members/bp-members-screens.php
+++ bp-members/bp-members-screens.php
@@ -34,7 +34,7 @@ function bp_members_screen_display_profile() {
  * @uses apply_filters()
  */
 function bp_members_screen_index() {
-	if ( !bp_is_user() && bp_is_current_component( 'members' ) ) {
+	if ( !bp_is_user() && bp_is_members_component() ) {
 		bp_update_is_directory( true, 'members' );
 
 		do_action( 'bp_members_screen_index' );
Index: bp-messages/bp-messages-template.php
===================================================================
--- bp-messages/bp-messages-template.php
+++ bp-messages/bp-messages-template.php
@@ -722,7 +722,7 @@ function bp_thread_has_messages( $args = '' ) {
 	$r = wp_parse_args( $args, $defaults );
 	extract( $r, EXTR_SKIP );
 
-	if ( !$thread_id && bp_is_current_component( 'messages' ) && bp_is_current_action( 'view' ) )
+	if ( !$thread_id && bp_is_messages_component() && bp_is_current_action( 'view' ) )
 		$thread_id = (int)bp_action_variable( 0 );
 
 	$thread_template = new BP_Messages_Thread_Template( $thread_id, $order );
Index: bp-themes/bp-default/sidebar.php
===================================================================
--- bp-themes/bp-default/sidebar.php
+++ bp-themes/bp-default/sidebar.php
@@ -56,7 +56,7 @@
 	<?php endif; ?>
 
 	<?php /* Show forum tags on the forums directory */
-	if ( bp_is_active( 'forums' ) && bp_is_current_component( 'forums' ) && bp_is_directory() ) : ?>
+	if ( bp_is_active( 'forums' ) && bp_is_forums_component() && bp_is_directory() ) : ?>
 		<div id="forum-directory-tags" class="widget tags">
 			<h3 class="widgettitle"><?php _e( 'Forum Topic Tags', 'buddypress' ) ?></h3>
 			<div id="tag-text"><?php bp_forums_tag_heat_map(); ?></div>
Index: bp-xprofile/bp-xprofile-actions.php
===================================================================
--- bp-xprofile/bp-xprofile-actions.php
+++ bp-xprofile/bp-xprofile-actions.php
@@ -22,8 +22,8 @@ if ( !defined( 'ABSPATH' ) ) exit;
  */
 function xprofile_action_delete_avatar() {
 	global $bp;
-	
-	if ( !bp_is_current_component( 'profile' ) || !bp_is_current_action( 'change-avatar' ) || !bp_is_action_variable( 'delete-avatar', 0 ) )
+
+	if ( !bp_is_profile_component() || !bp_is_current_action( 'change-avatar' ) || !bp_is_action_variable( 'delete-avatar', 0 ) )
 		return false;
 
 	// Check the nonce