Index: bp-activity/bp-activity-notifications.php
===================================================================
--- bp-activity/bp-activity-notifications.php
+++ bp-activity/bp-activity-notifications.php
@@ -95,7 +95,10 @@ To view and respond to the message, log in and visit: %3$s
 ', 'buddypress' ), $poster_name, $content, $message_link );
 		}
 
-		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		// Only show the disable notifications line if the settings component is enabled
+		if ( bp_is_active( 'settings' ) ) {
+			$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		}
 
 		/* Send the message */
 		$to 	 = apply_filters( 'bp_activity_at_message_notification_to', $to );
@@ -170,7 +173,10 @@ To view your original update and all comments, log in and visit: %3$s
 ---------------------
 ', 'buddypress' ), $poster_name, $content, $thread_link );
 
-		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		// Only show the disable notifications line if the settings component is enabled
+		if ( bp_is_active( 'settings' ) ) {
+			$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		}
 
 		/* Send the message */
 		$to = apply_filters( 'bp_activity_new_comment_notification_to', $to );
@@ -215,7 +221,10 @@ To view the original activity, your comment and all replies, log in and visit: %
 ---------------------
 ', 'buddypress' ), $poster_name, $content, $thread_link );
 
-		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		// Only show the disable notifications line if the settings component is enabled
+		if ( bp_is_active( 'settings' ) ) {
+			$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		}
 
 		/* Send the message */
 		$to = apply_filters( 'bp_activity_new_comment_notification_comment_author_to', $to );
Index: bp-friends/bp-friends-notifications.php
===================================================================
--- bp-friends/bp-friends-notifications.php
+++ bp-friends/bp-friends-notifications.php
@@ -39,7 +39,10 @@ To view %3$s\'s profile: %4$s
 ---------------------
 ', 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
 
-	$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	// Only show the disable notifications line if the settings component is enabled
+	if ( bp_is_active( 'settings' ) ) {
+		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	}
 
 	/* Send the message */
 	$to = apply_filters( 'friends_notification_new_request_to', $to );
@@ -74,7 +77,10 @@ To view %2$s\'s profile: %3$s
 ---------------------
 ', 'buddypress' ), $friend_name, $friend_name, $friend_link );
 
-	$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	// Only show the disable notifications line if the settings component is enabled
+	if ( bp_is_active( 'settings' ) ) {
+		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	}
 
 	/* Send the message */
 	$to = apply_filters( 'friends_notification_accepted_request_to', $to );
Index: bp-groups/bp-groups-notifications.php
===================================================================
--- bp-groups/bp-groups-notifications.php
+++ bp-groups/bp-groups-notifications.php
@@ -87,7 +87,10 @@ To view %4$s\'s profile: %5$s
 ---------------------
 ', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link );
 
-	$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	// Only show the disable notifications line if the settings component is enabled
+	if ( bp_is_active( 'settings' ) ) {
+		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	}
 
 	/* Send the message */
 	$to      = apply_filters( 'groups_notification_new_membership_request_to', $to );
@@ -142,7 +145,10 @@ To submit another request please log in and visit: %2$s
 ', 'buddypress' ), $group->name, $group_link );
 	}
 
-	$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	// Only show the disable notifications line if the settings component is enabled
+	if ( bp_is_active( 'settings' ) ) {
+		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	}
 
 	/* Send the message */
 	$to      = apply_filters( 'groups_notification_membership_request_completed_to', $to );
@@ -187,7 +193,10 @@ To view the group please visit: %3$s
 ---------------------
 ', 'buddypress' ), $promoted_to, $group->name, $group_link );
 
-	$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	// Only show the disable notifications line if the settings component is enabled
+	if ( bp_is_active( 'settings' ) ) {
+		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+	}
 
 	/* Send the message */
 	$to      = apply_filters( 'groups_notification_promoted_member_to', $to );
@@ -240,7 +249,10 @@ To view %5$s\'s profile visit: %6$s
 ---------------------
 ', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link );
 
-		$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		// Only show the disable notifications line if the settings component is enabled
+		if ( bp_is_active( 'settings' ) ) {
+			$message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+		}
 
 		/* Send the message */
 		$to      = apply_filters( 'groups_notification_group_invites_to', $to );
Index: bp-messages/bp-messages-notifications.php
===================================================================
--- bp-messages/bp-messages-notifications.php
+++ bp-messages/bp-messages-notifications.php
@@ -61,7 +61,10 @@ To view and read your messages please log in and visit: %4$s
 ---------------------
 ', 'buddypress' ), $sender_name, $subject, $content, $message_link );
 
-			$email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+			// Only show the disable notifications line if the settings component is enabled
+			if ( bp_is_active( 'settings' ) ) {
+				$email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+			}
 
 			// Send the message
 			$email_to      = apply_filters( 'messages_notification_new_message_to',      $email_to );