Index: history_inc.php
===================================================================
--- history_inc.php
+++ history_inc.php	(working copy)
@@ -78,7 +78,7 @@
 		<?php print_user( $t_item['userid'] ) ?>
 	</td>
 	<td class="small-caption">
-		<?php echo string_display( $t_item['note'] ) ?>
+		<?php echo string_display_line_links( $t_item['note'] ) ?>
 	</td>
 	<td class="small-caption">
 		<?php echo string_display_line_links( $t_item['change'] ) ?>
Index: core/history_api.php
===================================================================
--- core/history_api.php
+++ core/history_api.php	(working copy)
@@ -334,10 +334,10 @@
 					$t_note = lang_get( 'new_bug' );
 					break;
 				case BUGNOTE_ADDED:
-					$t_note = lang_get( 'bugnote_added' ) . ": " . $p_old_value;
+					$t_note = lang_get( 'bugnote_added' ) . ": " . config_get( 'bugnote_link_tag' ). $p_old_value;
 					break;
 				case BUGNOTE_UPDATED:
-					$t_note = lang_get( 'bugnote_edited' ) . ": " . $p_old_value;
+					$t_note = lang_get( 'bugnote_edited' ) . ": " . config_get( 'bugnote_link_tag' ). $p_old_value;
 					break;
 				case BUGNOTE_DELETED:
 					$t_note = lang_get( 'bugnote_deleted' ) . ": " . $p_old_value;
@@ -390,11 +390,11 @@
 					break;
 				case BUG_ADD_RELATIONSHIP:
 					$t_note = lang_get( 'relationship_added' );
-					$t_change = relationship_get_description_for_history( $p_old_value ) . ' ' . bug_format_id( $p_new_value );
+					$t_change = relationship_get_description_for_history( $p_old_value ) . ' ' . config_get( 'bug_link_tag' ). bug_format_id( $p_new_value );
 					break;
 				case BUG_REPLACE_RELATIONSHIP:
 					$t_note = lang_get( 'relationship_replaced' );
-					$t_change = relationship_get_description_for_history( $p_old_value ) . ' ' . bug_format_id( $p_new_value );
+					$t_change = relationship_get_description_for_history( $p_old_value ) . ' ' . config_get( 'bug_link_tag' ). bug_format_id( $p_new_value );
 					break;
 				case BUG_DEL_RELATIONSHIP:
 					$t_note = lang_get( 'relationship_deleted' );
Index: core/string_api.php
===================================================================
--- core/string_api.php
+++ core/string_api.php	(working copy)
@@ -333,7 +333,7 @@
 										if ( bugnote_exists( (int)$p_array[2] ) ) {
 											$t_bug_id = bugnote_get_field( (int)$p_array[2], \'bug_id\' );
 											if ( bug_exists( $t_bug_id ) ) {
-												return $p_array[1] . string_get_bugnote_view_link( $t_bug_id, (int)$p_array[2], null, ' . ($p_detail_info ? 'true' : 'false') . ', ' . ($p_fqdn ? 'true' : 'false') . ' );
+												return $p_array[1] . string_get_bugnote_view_link( $t_bug_id, (int)$p_array[2], null, ' . ($p_detail_info ? 'true' : 'false') . ', ' . ($p_fqdn ? 'true' : 'false') . ' ,false );
 											} else {
 												return $p_array[0];
 											}
@@ -521,7 +521,7 @@
 	# --------------------
 	# return an href anchor that links to a bug VIEW page for the given bug
 	#  account for the user preference and site override
-	function string_get_bugnote_view_link( $p_bug_id, $p_bugnote_id, $p_user_id = null, $p_detail_info = true, $p_fqdn = false ) {
+	function string_get_bugnote_view_link( $p_bug_id, $p_bugnote_id, $p_user_id = null, $p_detail_info = true, $p_fqdn = false, $p_note_lit = true ) {
 		if ( bug_exists( $p_bug_id ) && bugnote_exists( $p_bugnote_id ) ) {
 			$t_link = '<a href="';
 			if ( $p_fqdn ) {
@@ -534,9 +534,9 @@
 				$t_update_date = string_attribute( date( config_get( 'normal_date_format' ), ( db_unixtimestamp( bugnote_get_field( $p_bugnote_id, 'last_modified' ) ) ) ) );
 				$t_link .=  ' title="[' . $t_update_date . '] ' . $t_reporter . '"';
 			}
-			$t_link .= '>' . lang_get( 'bugnote' ) . ': ' . bugnote_format_id( $p_bugnote_id) . '</a>';
+			$t_link .= '>' . ( $p_note_lit ? lang_get( 'bugnote' ) . ': ' : '' ) . bugnote_format_id( $p_bugnote_id) . '</a>';
 		} else {
-			$t_link = lang_get( 'bugnote' ) . ': ' . bugnote_format_id( $p_bugnote_id);
+			$t_link = ( $p_note_lit ? lang_get( 'bugnote' ) . ': ' : '' ) . bugnote_format_id( $p_bugnote_id);
 		}
 
 		return $t_link;