Index: bp-activity/bp-activity-actions.php
--- bp-activity/bp-activity-actions.php Base (BASE)
+++ bp-activity/bp-activity-actions.php Locally Modified (Based On LOCAL)
@@ -325,9 +325,9 @@
 	}
 
 	$comment_id = bp_activity_new_comment( array(
-		'content' => $content,
+		'content'     => $content,
 		'activity_id' => $activity_id,
-		'parent_id' => $parent_id
+		'parent_id'   => false
 	));
 
 	if ( !empty( $comment_id ) )
Index: bp-activity/bp-activity-notifications.php
--- bp-activity/bp-activity-notifications.php Base (BASE)
+++ bp-activity/bp-activity-notifications.php Locally Modified (Based On LOCAL)
@@ -188,7 +188,7 @@
 	 * If this is a reply to another comment, send an email notification to the
 	 * author of the immediate parent comment.
 	 */
-	if ( $activity_id == $parent_id )
+	if ( empty( $parent_id ) || ( $activity_id == $parent_id ) )
 		return false;
 
 	$parent_comment = new BP_Activity_Activity( $parent_id );
Index: bp-themes/bp-default/_inc/global.js
--- bp-themes/bp-default/_inc/global.js Base (BASE)
+++ bp-themes/bp-default/_inc/global.js Locally Modified (Based On LOCAL)
@@ -411,7 +411,7 @@
 			}
 
 			/* Hide any error messages */
-			jq( 'form#' + form + ' div.error').hide();
+			jq( 'form#' + form.attr('id') + ' div.error').hide();
 			target.addClass('loading').prop('disabled', true);
 
 			var ajaxdata = {
@@ -452,7 +452,7 @@
 								form.parent().parent().addClass('has-comments');
 							}
 							);
-						jq( 'form#' + form + ' textarea').val('');
+						jq( 'form#' + form.attr('id') + ' textarea').val('');
 
 						/* Increase the "Reply (X)" button count */
 						jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );