diff --git a/Source/Source.API.php b/Source/Source.API.php
index c682e83..9d20882 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -264,7 +264,10 @@
 	$t_enable_mapping = config_get( 'plugin_Source_enable_mapping' );
 
 	$t_resolution = plugin_config_get( 'bugfix_resolution' );
-	$t_message_template = plugin_config_get( 'bugfix_message' );
+	$t_message_template = str_replace(
+		array( '$1', '$2', '$3', '$4' ),
+		array( '%1$s', '%2$s', '%3$s', '%4$s' ),
+		plugin_config_get( 'bugfix_message' ) );
 
 	$t_mappings = array();
 
diff --git a/Source/Source.php b/Source/Source.php
index 273fe8b..13a46b8 100644
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -55,7 +55,7 @@
 			'bugfix_regex_1'	=> '/(?:fixe?s?|resolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
 			'bugfix_regex_2'	=> '/#?(\d+)/',
 			'bugfix_resolution'	=> FIXED,
-			'bugfix_message'	=> 'Fix committed to %s branch.',
+			'bugfix_message'	=> 'Fix committed to $1 branch.',
 
 			'remote_checkin'	=> OFF,
 			'checkin_urls'		=> serialize( array( 'localhost' ) ),
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 4ebca4b..d0c2beb 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -87,7 +87,7 @@
 $s_plugin_Source_bugfix_regex_2 = 'Bug Fixed Regex Pass 2';
 $s_plugin_Source_bugfix_resolution = 'Bug Fixed Resolution';
 $s_plugin_Source_bugfix_message = 'Bug Fixed Message Template';
-$s_plugin_Source_bugfix_message_info = '<span class="small">Use %1$s for branch, %2$s for revision, %3$s for timestamp, or %4$s for commit message.</span>';
+$s_plugin_Source_bugfix_message_info = '<span class="small">Use $1 for branch, $2 for revision, $3 for timestamp, or $4 for commit message.</span>';
 $s_plugin_Source_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';