diff --git a/Source/Source.php b/Source/Source.php
index d2c37dd..273fe8b 100644
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -47,13 +47,15 @@
 			'enable_mapping'	=> OFF,
 			'enable_porting'	=> OFF,
 			'enable_resolving'	=> OFF,
+			'enable_message'	=> OFF,
 
 			'buglink_regex_1'	=> '/(?:bugs?|issues?|reports?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
 			'buglink_regex_2'	=> '/#?(\d+)/',
 
-			'bugfix_resolution'	=> FIXED,
 			'bugfix_regex_1'	=> '/(?:fixe?s?|resolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
 			'bugfix_regex_2'	=> '/#?(\d+)/',
+			'bugfix_resolution'	=> FIXED,
+			'bugfix_message'	=> 'Fix committed to %s branch.',
 
 			'remote_checkin'	=> OFF,
 			'checkin_urls'		=> serialize( array( 'localhost' ) ),
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index a432c4d..4ebca4b 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -86,6 +86,8 @@
 $s_plugin_Source_bugfix_regex_1 = 'Bug Fixed Regex Pass 1';
 $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_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';
@@ -93,6 +95,7 @@
 $s_plugin_Source_enabled_features = 'Enabled Features';
 $s_plugin_Source_enable_mapping = 'Branch Mappings';
 $s_plugin_Source_enable_resolving = 'Resolve Fixed Issues';
+$s_plugin_Source_enable_message = 'Bug Fixed Message';
 $s_plugin_Source_enable_porting = 'Porting Status';
 
 $s_plugin_Source_branch_mapping = 'Branch Mappings';
diff --git a/Source/pages/manage_config.php b/Source/pages/manage_config.php
index b45f6cf..7dd4f57 100644
--- a/Source/pages/manage_config.php
+++ b/Source/pages/manage_config.php
@@ -25,6 +25,7 @@
 
 $f_enable_mapping = gpc_get_bool( 'enable_mapping', OFF );
 $f_enable_resolving = gpc_get_bool( 'enable_resolving', OFF );
+$f_enable_message = gpc_get_bool( 'enable_message', OFF );
 $f_enable_porting = gpc_get_bool( 'enable_porting', OFF );
 
 $f_buglink_regex_1 = gpc_get_string( 'buglink_regex_1' );
@@ -32,11 +33,12 @@
 $f_buglink_regex_2 = gpc_get_string( 'buglink_regex_2' );
 $f_buglink_reset_2 = gpc_get_string( 'buglink_reset_2', OFF );
 
-$f_bugfix_resolution = gpc_get_int( 'bugfix_resolution' );
 $f_bugfix_regex_1 = gpc_get_string( 'bugfix_regex_1' );
 $f_bugfix_reset_1 = gpc_get_string( 'bugfix_reset_1', OFF );
 $f_bugfix_regex_2 = gpc_get_string( 'bugfix_regex_2' );
 $f_bugfix_reset_2 = gpc_get_string( 'bugfix_reset_2', OFF );
+$f_bugfix_resolution = gpc_get_int( 'bugfix_resolution' );
+$f_bugfix_message = gpc_get_string( 'bugfix_message' );
 
 function check_urls( $t_urls_in ) {
 	$t_urls_in = explode( "\n", $t_urls_in );
@@ -79,6 +81,7 @@
 
 maybe_set_option( 'enable_mapping', $f_enable_mapping );
 maybe_set_option( 'enable_resolving', $f_enable_resolving );
+maybe_set_option( 'enable_message', $f_enable_message );
 maybe_set_option( 'enable_porting', $f_enable_porting );
 
 if ( ! $f_buglink_reset_1 ) {
@@ -106,6 +109,7 @@
 }
 
 maybe_set_option( 'bugfix_resolution', $f_bugfix_resolution );
+maybe_set_option( 'bugfix_message', $f_bugfix_message );
 
 maybe_set_option( 'remote_checkin', $f_remote_checkin );
 maybe_set_option( 'checkin_urls', serialize( $t_checkin_urls ) );
diff --git a/Source/pages/manage_config_page.php b/Source/pages/manage_config_page.php
index bab4425..915691b 100644
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -73,6 +73,8 @@
 	<?php echo plugin_lang_get( 'enable_mapping' ) ?></label><br/>
 	<label><input type="checkbox" name="enable_resolving" <?php echo ( plugin_config_get( 'enable_resolving' ) ? 'checked="checked" ' : '' ) ?>/>
 	<?php echo plugin_lang_get( 'enable_resolving' ) ?></label><br/>
+	<label><input type="checkbox" name="enable_message" <?php echo ( plugin_config_get( 'enable_message' ) ? 'checked="checked" ' : '' ) ?>/>
+	<?php echo plugin_lang_get( 'enable_message' ) ?></label><br/>
 	<label><input type="checkbox" name="enable_porting" <?php echo ( plugin_config_get( 'enable_porting' ) ? 'checked="checked" ' : '' ) ?>/>
 	<?php echo plugin_lang_get( 'enable_porting' ) ?></label><br/>
 </td>
@@ -119,6 +121,12 @@
 <td><select name="bugfix_resolution"><?php print_enum_string_option_list( 'resolution', plugin_config_get( 'bugfix_resolution' ) ) ?></select></td>
 </tr>
 
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'bugfix_message' ) ?></td>
+<td><input name="bugfix_message" size="50" value="<?php echo string_attribute( plugin_config_get( 'bugfix_message' ) ) ?>"/><br/>
+<?php echo plugin_lang_get( 'bugfix_message_info' ) ?></td>
+</tr>
+
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>