diff --git a/src/bp-messages/bp-messages-template.php b/src/bp-messages/bp-messages-template.php
index ebbc33677f..68512bdf00 100644
--- a/src/bp-messages/bp-messages-template.php
+++ b/src/bp-messages/bp-messages-template.php
@@ -669,7 +669,7 @@ function bp_get_message_thread_total_and_unread_count( $thread_id = false ) {
 		}
 
 		$total  = bp_get_message_thread_total_count( $thread_id );
-		$unread = bp_get_message_thread_unread_count( $thread_id );
+		$unread = bp_get_message_thread_unread_count();
 
 		return sprintf(
 			/* translators: 1: total number, 2: accessibility text: number of unread messages */
diff --git a/src/bp-templates/bp-legacy/buddypress/members/single/messages/compose.php b/src/bp-templates/bp-legacy/buddypress/members/single/messages/compose.php
index 41de06e5c5..a5ede45de0 100644
--- a/src/bp-templates/bp-legacy/buddypress/members/single/messages/compose.php
+++ b/src/bp-templates/bp-legacy/buddypress/members/single/messages/compose.php
@@ -13,7 +13,7 @@
 	_e( 'Compose Message', 'buddypress' );
 ?></h2>
 
-<form action="<?php bp_messages_form_action('compose' ); ?>" method="post" id="send_message_form" class="standard-form" enctype="multipart/form-data">
+<form action="<?php bp_messages_form_action(); ?>" method="post" id="send_message_form" class="standard-form" enctype="multipart/form-data">
 
 	<?php