diff --git a/Source/Source.API.php b/Source/Source.API.php
index 586e796..433cffd 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -367,15 +367,17 @@
 		if ( $t_handler && !is_null( $t_user_id ) ) {
 			$t_bug->handler_id = $t_user_id;
 		}
+		
+		$t_private = plugin_config_get( 'bugfix_message_private' );
 
 		if ( $t_update ) {
 			if ( $t_message ) {
-				bugnote_add( $t_bug_id, $t_message, '0:00', false, 0, '', null, false );
+				bugnote_add( $t_bug_id, $t_message, '0:00', $t_private, 0, '', null, false );
 			}
 			$t_bug->update();
 
 		} else if ( $t_message ) {
-			bugnote_add( $t_bug_id, $t_message );
+			bugnote_add( $t_bug_id, $t_message, '0:00', $t_private );
 		}
 	}
 
diff --git a/Source/Source.php b/Source/Source.php
index 93d0e1d..41c4ab8 100755
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -59,6 +59,7 @@
 			'bugfix_status_pvm'	=> 0,
 			'bugfix_handler'	=> ON,
 			'bugfix_message'	=> 'Fix committed to $1 branch.',
+			'bugfix_message_private'	=> OFF,
 
 			'remote_checkin'	=> OFF,
 			'checkin_urls'		=> serialize( array( 'localhost' ) ),
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 0e3e338..b66f3d7 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -96,6 +96,7 @@
 $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, $5 for repository name, or $6 for changeset ID.</span>';
+$s_plugin_Source_bugfix_message_private = 'Make Bug Fixed mesage private';
 $s_plugin_Source_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';
diff --git a/Source/pages/manage_config.php b/Source/pages/manage_config.php
index 39fcfd8..b4afdb4 100755
--- a/Source/pages/manage_config.php
+++ b/Source/pages/manage_config.php
@@ -37,6 +37,7 @@
 $f_bugfix_status_pvm = gpc_get_int( 'bugfix_status_pvm', plugin_config_get( 'bugfix_status_pvm' ) );
 $f_bugfix_handler = gpc_get_bool( 'bugfix_handler', OFF );
 $f_bugfix_message = gpc_get_string( 'bugfix_message' );
+$f_bugfix_message_private = gpc_get_bool( 'bugfix_message_private', OFF );
 
 function check_urls( $t_urls_in ) {
 	$t_urls_in = explode( "\n", $t_urls_in );
@@ -116,6 +117,7 @@
 maybe_set_option( 'bugfix_status_pvm', $f_bugfix_status_pvm );
 maybe_set_option( 'bugfix_handler', $f_bugfix_handler );
 maybe_set_option( 'bugfix_message', $f_bugfix_message );
+maybe_set_option( 'bugfix_message_private', $f_bugfix_message_private );
 
 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 ebe6dfc..90802f3 100755
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -144,8 +144,12 @@
 
 <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>
+<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' ) ?><br/>
+	<label><input type="checkbox" name="bugfix_message_private" <?php echo ( plugin_config_get( 'bugfix_message_private' ) ? 'checked="checked" ' : '' ) ?>/>
+	<?php echo plugin_lang_get( 'bugfix_message_private' ) ?></label><br/>
+</td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>