diff --git a/Source/Source.API.php b/Source/Source.API.php
index bd19385..c75f207 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -263,8 +263,8 @@
 	$t_resolution = config_get( 'plugin_Source_bugfix_resolution' );
 	$t_handler = config_get( 'plugin_Source_bugfix_handler' );
 	$t_message_template = str_replace(
-		array( '$1', '$2', '$3', '$4', '$5' ),
-		array( '%1$s', '%2$s', '%3$s', '%4$s', '%5$s' ),
+		array( '$1', '$2', '$3', '$4', '$5', '$6' ),
+		array( '%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s' ),
 		config_get( 'plugin_Source_bugfix_message' ) );
 
 	$t_mappings = array();
@@ -310,7 +310,7 @@
 
 		# generate a note message
 		if ( $t_enable_message ) {
-			$t_message = sprintf( $t_message_template, $t_changeset->branch, $t_changeset->revision, $t_changeset->timestamp, $t_changeset->message, $t_repos[ $t_changeset->repo_id ]->name );
+			$t_message = sprintf( $t_message_template, $t_changeset->branch, $t_changeset->revision, $t_changeset->timestamp, $t_changeset->message, $t_repos[ $t_changeset->repo_id ]->name, $t_changeset->id );
 		} else {
 			$t_message = '';
 		}
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index f5b10d7..de1c534 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -91,7 +91,7 @@
 $s_plugin_Source_bugfix_resolution = 'Bug Fixed Resolution';
 $s_plugin_Source_bugfix_handler = 'Bug Fixed Assign To Committer';
 $s_plugin_Source_bugfix_message = 'Bug Fixed Message Template';
-$s_plugin_Source_bugfix_message_info = '<span class="small">Use $1 for branch, $2 for revision, $3 for timestamp, $4 for commit message, or $5 for repository name.</span>';
+$s_plugin_Source_bugfix_message_info = '<span class="small">Use $1 for branch, $2 for revision, $3 for timestamp, $4 for commit message, $5 for repository name, or $6 for changeset ID.</span>';
 $s_plugin_Source_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';