diff --git a/html/forum/forum.php b/html/forum/forum.php
index d417c87e78..cfdb01e37c 100644
--- a/html/forum/forum.php
+++ b/html/forum/forum.php
@@ -3,23 +3,49 @@ require_once('../include.php');
 require_once('forum.inc');
 doHeader('Forum');
 
+// Number of forum topics per page.
 $n = 50;
 
 /* sanitize variable */
 $_GET['id'] = stripslashes(strip_tags($_GET['id']));
+// Is this sanitization stuff really necessary?
+$_GET['sort'] = stripslashes(strip_tags($_GET['sort']));
 
 if (!array_key_exists('start', $_GET) || $_GET['start'] < 0)
 	$_GET['start'] = 0;
+        
+$sort_style = $_GET['sort'];
 
+if ($sort_style == NULL) {
+    $sort_style = 'modified-new';
+}
+        
 $forum = getForum($_GET['id']);
 ?>
+<form action="forum.php" method="get">
+<input type="hidden" name="id" value=<?php echo $forum->id ?>>
+<table width=100% cellspacing=0 cellpadding=0>
+  <tr valign="bottom">
+    <td align="left" style="border:0px"> 
 
 <p>
 	<span class="title"><?php echo $forum->title ?></span>
 	<br><a href="index.php"><?php echo $cfg['sitename'] ?> Forum</a>
 </p>
 <p><a href="post.php?id=<?php echo $_GET['id'] ?>">Post a New Thread / Question</a></p>
-
+</td>
+<td align="right" style="border:0px">
+<select name="sort">
+  <option <?php if ($sort_style == 'modified-new') echo 'selected' ?> value="modified-new">Most recent post first</option>
+  <option <?php if ($sort_style == 'modified-old') echo 'selected' ?> value="modified-old">Least recent post first</option>
+  <!--<option <?php if ($sort_style == 'activity-most') echo 'selected' ?> value="activity-most">Most recent activity first</option>-->
+  <option <?php if ($sort_style == 'views-most') echo 'selected' ?> value="views-most">Most views first</option>
+  <option <?php if ($sort_style == 'replies-most') echo 'selected' ?> value="replies-most">Most replies first</option>
+</select>
+<input type="submit" value="Sort">  
+</td>
+</tr></table>
+</form>
 <?php
 if ($forum->threads > $n):
 	$totalPages = floor($forum->threads / $n);
@@ -74,14 +100,14 @@ endif;
 			<th style="width: 170px">Last Post</th>
 		</tr>
 		<?php
-		$threads = $forum->getThreads($_GET['start'], $n);
+		$threads = $forum->getThreads($_GET['start'], $n, $sort_style);
 		while($thread = getNextThread($threads)):
 			$user = getUser($thread->owner);
 			?>
 			<tr style="font-size:8pt; text-align:center">
 				<td class="col1" style="font-size:10pt; text-align:left"><a href="thread.php?id=<?php echo $thread->id ?>"><b><?php echo stripslashes($thread->title) ?></b></a></td>
 				<td class="col2"><?php echo $thread->replies ?></td>
-				<td class="col3"><a href="../view_profile.php?userid=<?php echo $thread->owner ?>"><?php echo $user->name ?></a></td>
+				<td class="col3"><a href="../show_user.php?userid=<?php echo $thread->owner ?>"><?php echo $user->name ?></a></td>
 				<td class="col2"><?php echo $thread->views ?></td>
 				<td class="col3" style="text-align:right"><?php echo date('D M j, Y g:i a', $thread->timestamp) ?></td>
 			</tr>