Index: bp-core/bp-core-buddybar.php
===================================================================
--- bp-core/bp-core-buddybar.php	(revision 4860)
+++ bp-core/bp-core-buddybar.php	(working copy)
@@ -86,6 +86,19 @@
 	do_action( 'bp_core_new_nav_item', $r, $args, $defaults );
 }
 
+function bp_is_component_subnav_exists($component = false){
+	global $bp;
+	
+	if (!$component)
+		$component = $bp->current_component;
+	
+	if (count($bp->bp_options_nav[$component]) > 0)
+		return true;
+
+	return false;
+}
+
+
 /**
  * Modify the default subnav item to load when a top level nav item is clicked.
  *
Index: bp-themes/bp-default/members/single/profile.php
===================================================================
--- bp-themes/bp-default/members/single/profile.php	(revision 4860)
+++ bp-themes/bp-default/members/single/profile.php	(working copy)
@@ -8,9 +8,8 @@
  */
 
 ?>
+<?php if (bp_is_component_subnav_exists()) : ?>
 
-<?php if ( bp_is_my_profile() ) : ?>
-
 	<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
 		<ul>
 
@@ -20,7 +19,7 @@
 	</div><!-- .item-list-tabs -->
 
 <?php endif; ?>
-
+	
 <?php do_action( 'bp_before_profile_content' ); ?>
 
 <div class="profile" role="main">
Index: bp-xprofile/bp-xprofile-loader.php
===================================================================
--- bp-xprofile/bp-xprofile-loader.php	(revision 4860)
+++ bp-xprofile/bp-xprofile-loader.php	(working copy)
@@ -118,7 +118,7 @@
 			'item_css_id'         => $this->id
 		);
 
-		$profile_link = trailingslashit( $bp->loggedin_user->domain . $this->slug );
+		$profile_link = trailingslashit( $bp->displayed_user->domain . $this->slug );
 
 		// Add the subnav items to the profile
 		$sub_nav[] = array(
@@ -137,8 +137,8 @@
 			'parent_url'      => $profile_link,
 			'parent_slug'     => $this->slug,
 			'screen_function' => 'xprofile_screen_edit_profile',
-			'position'        => 20
-		);
+			'position'        => 20,
+			'user_has_access' => bp_is_my_profile()		);
 
 		// Change Avatar
 		$sub_nav[] = array(
@@ -147,8 +147,8 @@
 			'parent_url'      => $profile_link,
 			'parent_slug'     => $this->slug,
 			'screen_function' => 'xprofile_screen_change_avatar',
-			'position'        => 30
-		);
+			'position'        => 30,
+			'user_has_access' => bp_is_my_profile()		);
 
 		parent::setup_nav( $main_nav, $sub_nav );
 	}