diff --git a/bug_change_status_page.php b/bug_change_status_page.php
index 97e0fab..e914438 100644
--- a/bug_change_status_page.php
+++ b/bug_change_status_page.php
@@ -36,6 +36,10 @@
 	$f_bug_id = gpc_get_int( 'bug_id' );
 	$t_bug = bug_get( $f_bug_id );
 	
+	# reply patch 
+	$f_bugnote_text = gpc_get_string( 'bugnote_text', '' );
+	$f_new_handler = gpc_get_int( 'new_handler', NO_USER );
+
 	if( $t_bug->project_id != helper_get_current_project() ) {
 		# in case the current project is not the same project of the bug we are viewing...
 		# ... override the current project. This to avoid problems with categories and handlers lists etc.
@@ -160,8 +164,33 @@ if ( ( $t_resolved > $f_new_status ) &&
 	<td>
 		<select name="handler_id">
 			<option value="0"></option>
-			<?php print_assign_to_option_list( $t_bug->handler_id, $t_bug->project_id ) ?>
+			<?php 
+			# reply patch
+			print_assign_to_option_list( 
+                                $f_new_handler != NO_USER ?
+                                $f_new_handler :
+				( # ( FEEDBACK == $f_new_status ? 
+				# $t_bug->reporter_id :
+				$t_bug->handler_id ), $t_bug->project_id ) ?>
 		</select>
+		<?php 
+			# reply patch
+           if ( $f_new_handler != NO_USER && 
+                              $t_bug->handler_id != $f_new_handler ) {
+				echo '(default: changed from "' . 
+					 prepare_user_name( $t_bug->handler_id ) .
+					 '" to  "' . 
+					 prepare_user_name( $f_new_handler ) . '")';
+			} # else {
+  			#  if ( FEEDBACK == $f_new_status && 
+			#	 $t_bug->reporter_id != $t_bug->handler_id ) {
+			#	echo '(default: changed from "' . 
+			#		 prepare_user_name( $t_bug->handler_id ) .
+			#		 '" to reporter "' . 
+			#		 prepare_user_name( $t_bug->reporter_id ) . '")';
+			#  }
+                        #  }
+		?>
 	</td>
 </tr>
 <?php } ?>
@@ -274,7 +303,10 @@ if ( ( $f_new_status >= $t_resolved ) && ( CLOSED > $f_new_status ) ) { ?>
 		<?php echo lang_get( 'add_bugnote_title' ) ?>
 	</td>
 	<td class="center">
-		<textarea name="bugnote_text" cols="80" rows="10"></textarea>
+		<textarea name="bugnote_text" cols="80" rows="10"><?php
+  # reply-patch
+  echo $f_bugnote_text;
+?></textarea>
 	</td>
 </tr>
 <?php if ( access_has_bug_level( config_get( 'private_bugnote_threshold' ), $f_bug_id ) ) { ?>
diff --git a/bugnote_view_inc.php b/bugnote_view_inc.php
index 50ff0af..321e809 100644
--- a/bugnote_view_inc.php
+++ b/bugnote_view_inc.php
@@ -157,6 +157,22 @@
 					$t_can_delete_note = true;
 				}
 
+
+                # reply patch
+                $t_linebegin = "<b>";
+                $t_lineend = "</b>";
+                $t_text = $t_linebegin .
+                   sprintf(
+                     lang_get( 'in_reply_to' ),
+                     config_get( 'bugnote_link_tag' ) . $v3_id,
+                     prepare_user_name( $v3_reporter_id ) ) .
+                   $t_lineend . "\r\n" .
+                   preg_replace( "/^([^\r\n]*)/m",
+                                 $t_linebegin . "> $1". $t_lineend,
+                                 $row[ 'note' ] );
+                print_button( 'bug_change_status_page.php?new_status=20&new_handler='.$v3_reporter_id.'&bug_id='.$f_bug_id.'&bugnote_text='.urlencode($t_text),lang_get( 'reply' ) );
+                
+
 				# users above update_bugnote_threshold should be able to edit this bugnote
 				if ( $t_can_edit_note || access_has_bug_level( config_get( 'update_bugnote_threshold' ), $f_bug_id ) ) {
 					print_button( 'bugnote_edit_page.php?bugnote_id='.$v3_id, lang_get( 'bugnote_edit_link' ) );
diff --git a/lang/strings_english.txt b/lang/strings_english.txt
index 68091d6..9f19c2d 100644
--- a/lang/strings_english.txt
+++ b/lang/strings_english.txt
@@ -157,6 +157,10 @@ $s_set_sticky_group_bugs_button = 'Set/Unset Sticky';
 $s_fixed_in_version_group_bugs_button = 'Update Fixed in Version';
 $s_target_version_group_bugs_button = 'Update Target Version';
 
+# reply patch
+$s_reply = 'Reply';
+$s_in_reply_to = 'In reply to %s from %s';
+
 # improved JPgraphs strings
 $s_graph_imp_status_title = 'Synthesis graphs by status';
 $s_graph_imp_priority_title = 'Synthesis graphs by priority';