Index: bb-includes/functions.bb-template.php
===================================================================
--- bb-includes/functions.bb-template.php	(revision 3371)
+++ bb-includes/functions.bb-template.php	(working copy)
@@ -3573,10 +3573,10 @@
 	$tab        = $args['tab'] !== false ? ' tabindex="' . $args['tab'] . '"' : '';
 
 	// Change subscription checkbox message if current or moderating
-	if ( isset( $_GET['new'] ) || ( $is_current = ( bb_get_user_id( get_post_author_id() ) == bb_get_current_user_info( 'id' ) ) ) )
+	if ( bb_is_topic_edit() && ( $is_current = ( bb_get_user_id( get_post_author_id() ) != bb_get_current_user_info( 'id' ) ) ) )
+		$text = __( 'This user should be notified of follow-up posts via email' );
+	else
 		$text = __( 'Notify me of follow-up posts via email' );
-	else
-		$text = __( 'This user should be notified of follow-up posts via email' );
 
 	echo '
 	<label for="subscription_checkbox">