diff --git a/Source/Source.API.php b/Source/Source.API.php
index 433cffd..10d9f31 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -367,8 +367,8 @@
 		if ( $t_handler && !is_null( $t_user_id ) ) {
 			$t_bug->handler_id = $t_user_id;
 		}
-		
-		$t_private = plugin_config_get( 'bugfix_message_private' );
+
+		$t_private = plugin_config_get( 'bugfix_message_view_status' ) == VS_PRIVATE;
 
 		if ( $t_update ) {
 			if ( $t_message ) {
diff --git a/Source/Source.php b/Source/Source.php
index 41c4ab8..f6cd24c 100755
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -59,7 +59,7 @@
 			'bugfix_status_pvm'	=> 0,
 			'bugfix_handler'	=> ON,
 			'bugfix_message'	=> 'Fix committed to $1 branch.',
-			'bugfix_message_private'	=> OFF,
+			'bugfix_message_view_status'	=> VS_PUBLIC,
 
 			'remote_checkin'	=> OFF,
 			'checkin_urls'		=> serialize( array( 'localhost' ) ),
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index b66f3d7..e4eccea 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -96,7 +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_bugfix_message_view_status = 'Bug Fixed Message View State';
 $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 b4afdb4..f1d89a7 100755
--- a/Source/pages/manage_config.php
+++ b/Source/pages/manage_config.php
@@ -37,7 +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 );
+$f_bugfix_message_view_status = gpc_get_int( 'bugfix_message_view_status', VS_PUBLIC );
 
 function check_urls( $t_urls_in ) {
 	$t_urls_in = explode( "\n", $t_urls_in );
@@ -117,7 +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( 'bugfix_message_view_status', $f_bugfix_message_view_status );
 
 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 90802f3..00754c2 100755
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -146,9 +146,16 @@
 <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' ) ?><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/>
+	<?php echo plugin_lang_get( 'bugfix_message_info' ) ?><br/>
+</td>
+</tr>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'bugfix_message_view_status' ) ?></td>
+<td>
+	<select name="bugfix_message_view_status">
+		<?php print_enum_string_option_list( 'view_state', plugin_config_get( 'bugfix_message_view_status' ) ) ?>
+	</select>
 </td>
 </tr>