diff --git a/html/forum/reply.php b/html/forum/reply.php
index 9fef9cb15b..38558fcec5 100644
--- a/html/forum/reply.php
+++ b/html/forum/reply.php
@@ -3,25 +3,40 @@ require_once('../include.php');
 require_once('forum.inc');
 require_once('../util.inc');
 
-if (!empty($_GET['id']) && !empty($_POST['content'])) {
-	$_GET['id'] = stripslashes(strip_tags($_GET['id']));
+if (!empty($_GET['thread']) && !empty($_POST['content'])) {
+        $_GET['thread'] = stripslashes(strip_tags($_GET['thread']));
+        
+        if (!empty($_GET['post'])) {
+            $parent_post = $_GET['post'];
+        } else {
+            $parent_post = NULL;
+        }
 
 	//$user = getUserByAuth($_SESSION['authenticator']);
 	$user = get_logged_in_user(true);
 
-	$thread = getThread($_GET['id']);
-	$thread->reply($user->id, $_POST['content']);
+	$thread = getThread($_GET['thread']);
+	$thread->reply($user->id, $_POST['content'], $parent_post);
 
 	header('Location: thread.php?id='.$thread->id);
 }
 
 if (empty($_SESSION['authenticator']))
-	header('Location: ../login_form.php');
+    get_logged_in_user(true, '../');
 
+        
 doHeader('Forum');
 
-$thread = getThread($_GET['id']);
+if (!empty($_GET['post'])) {
+    $postId = $_GET['post'];
+} else {
+    $postId = -1;
+}
+$thread = getThread($_GET['thread']);
 $forum = getForum($thread->forum);
+
+$logged_in_user = get_logged_in_user(true);
+
 ?>
 
 <p>
@@ -29,25 +44,6 @@ $forum = getForum($thread->forum);
 	<br><a href="index.php"><?php echo $cfg['sitename'] ?> Forum</a> -> <a href="forum.php?id=<?php echo $forum->id ?>"><?php echo $forum->title ?></a>
 </p>
 
-<p style="text-align:center">
-	<form action="reply.php?id=<?php echo $_GET['id'] ?>" method="post">
-		<table class="content" border="0" cellpadding="5" cellspacing="0" width="100%">
-			<tr>
-				<th colspan="2">Reply to Thread / Question</th>
-			</tr>
-			<tr>
-				<td style="vertical-align:top; width:150px"><b>Message content</b></td>
-				<td><textarea name="content" rows="12" cols="54"></textarea></td>
-			</tr>
-			<tr>
-				<td colspan="2" style="text-align:center">
-					<input type="submit" value="Post reply">
-				</td>
-			</tr>
-		</table>
-	</form>
-</p>
-
 <p style="text-align:center">
 	<table class="content" border="0" cellpadding="5" cellspacing="0" width="100%">
 		<tr>
@@ -55,7 +51,9 @@ $forum = getForum($thread->forum);
 			<th>Message</th>
 		</tr>
 		<?php
-
+                if ($post != -1) {
+                    
+                }
 		$posts = $thread->getPosts();
 		while ($post = getNextPost($posts)):
 			$user = getUser($post->user);
@@ -63,7 +61,9 @@ $forum = getForum($thread->forum);
 			<tr style="vertical-align:top">
 				<td>
 					<p style="font-weight:bold">
+					<?php if ($user->has_profile) { ?>
 						<a href="../view_profile.php?userid=<?php echo $post->user ?>"><?php echo $user->name ?></a>
+					<?php } else { echo $user->name; } ?>
 					</p>
 					<p style="font-size:8pt">
 						Joined: <?php echo date('M j, Y', $user->create_time) ?>
@@ -71,17 +71,64 @@ $forum = getForum($thread->forum);
 					</p>
 				</td>
 				<td>
-					<p style="font-size:8pt">Posted: <?php echo date('D M j, Y g:i a', $post->timestamp) ?></p>
-					<p><?php echo nl2br(stripslashes($post->content)) ?></p>
-				</td>
-			</tr>
-			<?php
-		endwhile;
-
-		?>
+                                        <p style="font-size:8pt">Posted: <?php echo date('D M j, Y g:i a', $post->timestamp) ?></p>
+                                        <p><?php echo nl2br(stripslashes($post->content)) ?></p>
+                                </td>
+                                        <?php if ($post->id == $postId) {
+						show_message_row($thread, $post);
+                                        } ?>
+                                        
+		<?php endwhile;
+		
+		if ($postId == -1) {
+                    show_message_row($thread, $post);
+		} ?>
 	</table>
-</p>
+ </p>
 
 <?php
 doFooter();
 ?>
+
+<?php
+
+function show_message_row($thread, $post = NULL) {
+    global $logged_in_user;
+    
+    echo "
+    <a name=\"input\"></a>
+    <tr class = \"row1\" style=\"vertical-align:top\">
+        <td>
+        <p style=\"font-weight:bold\">
+    ";
+
+    if ($logged_in_user->has_profile) {
+        echo "<a href=\"../view_profile.php?userid=", $logged_in_user->id, "\">", $logged_in_user->name, "</a>";
+    } else { 
+        echo $logged_in_user->name;
+    }
+    
+    echo "
+</p>
+<p style=\"font-size:8pt\">
+Joined: ", date('M j, Y', $logged_in_user->create_time), "
+</p>
+</td>	
+<td>
+	<p style=\"font-size:8pt\">Your Message</p>
+	<form action='reply.php?thread=", $thread->id;
+
+    if ($post) {
+        echo "&post=", $post->id;
+    }
+
+    echo "' method=\"post\">
+	    <textarea name=\"content\" rows=\"12\" cols=\"54\"></textarea><p>
+	    <input type=\"submit\" value=\"Post reply\"></p>
+	</form>
+	";
+
+    echo "</td></tr>";
+}
+
+?>
\ No newline at end of file