Index: bp-core/bp-core-templatetags.php
===================================================================
--- bp-core/bp-core-templatetags.php	(revision 1828)
+++ bp-core/bp-core-templatetags.php	(working copy)
@@ -1583,7 +1583,7 @@
 function bp_the_body_class() {
 	echo bp_get_the_body_class();
 }
-	function bp_get_the_body_class( $wp_classes ) {
+	function bp_get_the_body_class( $wp_classes, $class ) {
 		if ( bp_is_blog_page() || bp_is_activation_page() || bp_is_register_page() )
 			$bp_classes[] = 'blog-page';
 			
@@ -1715,14 +1715,22 @@
 
 		if ( is_year() )		
 			$bp_classes[] = 'blog-year';
-		
+
 		/* We don't want WordPress blog classes to appear on non-blog pages. */
-		if ( !bp_is_blog_page() ) 
- 			$wp_classes = array();
-		
+		if ( !bp_is_blog_page() ) {
+			/* From wp-includes/post-template.php function get_body_class; preserves user-added class(es). */
+			if ( !empty( $class ) ) {
+				if ( !is_array( $class ) )
+					$class = preg_split( '#\s+#', $class );
+				$wp_classes = $class;
+			}
+			else
+	 			$wp_classes = array();
+		}
+
 		return apply_filters( 'bp_get_the_body_class', array_merge( (array) $bp_classes, (array) $wp_classes ), $bp_classes, $wp_classes );
 	}
-	add_filter( 'body_class', 'bp_get_the_body_class' )
+	add_filter( 'body_class', 'bp_get_the_body_class', 0, 2 )
 
 
 ?>
\ No newline at end of file