Index: bp-activity/bp-activity-template.php
===================================================================
--- bp-activity/bp-activity-template.php	(revision 4466)
+++ bp-activity/bp-activity-template.php	(working copy)
@@ -850,6 +850,28 @@ function bp_activity_comments( $args = '' ) {
 				$content .= '</div>';
 				$content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment_child->content ) . '</div>';
 
+				if ( is_user_logged_in() ) {
+					$content .= '<form action="' . bp_get_activity_comment_form_action() . '" method="post" id="ac-form-' . $comment_child->id .  '" class="ac-form">';
+					
+					$content .= '<div class="ac-reply-avatar">' .  bp_get_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ) . '</div>';
+					
+					$content .= '<div class="ac-reply-content">';
+					
+					$content .= '<div class="ac-textarea">				<textarea id="ac-input-' . $comment_child->id . '" class="ac-input" name="ac_input_' . $comment_child->id . ' "></textarea></div>';
+					
+					$content .= '<input type="submit" name="ac_form_submit" value="' . __( 'Post', 'buddypress' ) . ' &rarr;" />';
+					
+					$content .= '&nbsp; ' . __( 'or press esc to cancel.', 'buddypress' );
+					
+					$content .= '<input type="hidden" name="comment_form_id" value="' . $comment_child->id . '" />';					
+					
+					$content .= '</div>';
+					
+					$content .= wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' );
+					
+					$content .= '</form>';
+				}
+
 				$content .= bp_activity_recurse_comments( $comment_child );
 				$content .= '</li>';
 
@@ -967,9 +989,9 @@ function bp_activity_css_class() {
 			'new_member'
 		) );
 
-		$class = '';
+		$class = ' activity-root';
 		if ( in_array( $activities_template->activity->type, (array)$mini_activity_actions ) || empty( $activities_template->activity->content ) )
-			$class = ' mini';
+			$class .= ' mini';
 
 		if ( bp_activity_get_comment_count() && bp_activity_can_comment() )
 			$class .= ' has-comments';