diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index 817d088a5f..4939b42a70 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -567,7 +567,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 	$errno = 0;
 	$errstr = $version_info = '';
 
-	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr))
+	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10))
 	{
 		@fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n");
 		@fputs($fsock, "HOST: www.phpbb.com\r\n");
@@ -602,7 +602,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 		else
 		{
 			$version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
-			$version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
+			$version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . ' ' . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
 		}
 	}
 	else
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php
index 054394f05e..adaa2bf657 100644
--- a/phpBB/db/mysql.php
+++ b/phpBB/db/mysql.php
@@ -259,7 +259,7 @@ class sql_db
 				{
 					if($this->rowset[$query_id])
 					{
-						$result = $this->rowset[$query_id][$field];
+						$result = $this->rowset[$query_id][0][$field];
 					}
 					else if($this->row[$query_id])
 					{
diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php
index b0e657e8ee..d00ea7700e 100644
--- a/phpBB/db/mysql4.php
+++ b/phpBB/db/mysql4.php
@@ -271,7 +271,7 @@ class sql_db
 				{
 					if( $this->rowset[$query_id] )
 					{
-						$result = $this->rowset[$query_id][$field];
+						$result = $this->rowset[$query_id][0][$field];
 					}
 					else if( $this->row[$query_id] )
 					{
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index fd560eaa96..a6d014ef20 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -67,9 +67,11 @@ p,ul,td {font-size:10pt;}
 <ul>
 <li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li>
 <li>[Fix] retrieving category rows in index.php (Bug #90)</li>
+<li>[Fix] Improved index performance by determining the permissions before iterating through all forums (Bug #91)</li>
 <li>[Fix] wrong topic redirection after login redirect (Bug #94)</li>
 <li>[Fix] improved handling of username lists in admin_ug_auth.php (Bug #98)</li>
 <li>[Fix] incorrect removal of bbcode_uid values if bbcode has been turned off (Bug #100)</li>
+<li>[Fix] correctly preview signature if editing other users posts (Bug #101)</li>
 <li>[Fix] incorrect alt tag on generated search images in viewtopic.php and usercp_viewprofile.php (Bug #102)</li>
 <li>[Fix] consistent forum ordering in all dropdown boxes (Bug #106)</li>
 <li>[Fix] correctly get compression status in page_tail.php and page_footer_admin.php (Bug #117)</li>
@@ -83,9 +85,11 @@ p,ul,td {font-size:10pt;}
 <li>[Fix] removed unset variable from smilies popup window title (Bug #224)</li>
 <li>[Fix] removed duplicate template assignment from admin_board.php (Bug #226)</li>
 <li>[Fix] incorrect search link for guest posts in modcp.php (Bug #254)</li>
+<li>[Fix] all users removed from topics watch table on special occassions (Bug #271)</li>
 <li>[Fix] correctly check returned value from strpos in append_sid function (Bug #275)</li>
 <li>[Fix] correctly display username in private message notification (Bug #278)</li>
 <li>[Fix] fixed "var-by-ref" errors (Bug #322)</li>
+<li>[Fix] added timout of 10 seconds to version check (Bug #348)</li>
 
 <a name="2016"></a><h3 class="h3">l.ii. Changes since 2.0.16</h3>
 
diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php
index e5d868ff4e..ab3ae3bc43 100644
--- a/phpBB/includes/functions_post.php
+++ b/phpBB/includes/functions_post.php
@@ -578,16 +578,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 
 	$current_time = time();
 
-	if ($mode == 'delete')
-	{
-		$delete_sql = (!$post_data['first_post'] && !$post_data['last_post']) ? " AND user_id = " . $userdata['user_id'] : '';
-		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
-		if (!$db->sql_query($sql))
-		{
-			message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
-		}
-	}
-	else 
+	if ($mode != 'delete')
 	{
 		if ($mode == 'reply')
 		{
diff --git a/phpBB/index.php b/phpBB/index.php
index 03baa4723d..2f9b4023c8 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -296,6 +296,19 @@ if( ( $total_categories = count($category_rows) ) )
 		'U_MARK_READ' => append_sid("index.$phpEx?mark=forums"))
 	);
 
+	//
+	// Let's decide which categories we should display
+	//
+	$display_categories = array();
+
+	for ($i = 0; $i < $total_forums; $i++ )
+	{
+		if ($is_auth_ary[$forum_data[$i]['forum_id']]['auth_view'])
+		{
+			$display_categories[$forum_data[$i]['cat_id']] = true;
+		}
+	}
+
 	//
 	// Okay, let's build the index
 	//
@@ -303,23 +316,11 @@ if( ( $total_categories = count($category_rows) ) )
 	{
 		$cat_id = $category_rows[$i]['cat_id'];
 
-		//
-		// Should we display this category/forum set?
-		//
-		$display_forums = false;
-		for($j = 0; $j < $total_forums; $j++)
-		{
-			if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id )
-			{
-				$display_forums = true;
-			}
-		}
-
 		//
 		// Yes, we should, so first dump out the category
 		// title, then, if appropriate the forum list
 		//
-		if ( $display_forums )
+		if (isset($display_categories[$cat_id]) && $display_categories[$cat_id])
 		{
 			$template->assign_block_vars('catrow', array(
 				'CAT_ID' => $cat_id,
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 2335cd0e7e..dd512abe07 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -204,7 +204,7 @@ switch ( $mode )
 			message_die(GENERAL_MESSAGE, $lang['No_post_id']);
 		}
 
-		$select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : '';
+		$select_sql = (!$submit) ? ', t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid' : '';
 		$from_sql = ( !$submit ) ? ", " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u" : '';
 		$where_sql = ( !$submit ) ? "AND pt.post_id = p.post_id AND u.user_id = p.poster_id" : '';
 
@@ -634,6 +634,7 @@ if( $refresh || isset($HTTP_POST_VARS['del_poll_option']) || $error_msg != '' )
 	else if ( $mode == 'editpost' )
 	{
 		$user_sig = ( $post_info['user_sig'] != '' && $board_config['allow_sig'] ) ? $post_info['user_sig'] : '';
+		$userdata['user_sig_bbcode_uid'] = $post_info['user_sig_bbcode_uid'];
 	}
 	
 	if( $preview )
diff --git a/phpBB/templates/subSilver/admin/forum_admin_body.tpl b/phpBB/templates/subSilver/admin/forum_admin_body.tpl
index 4b699323d8..8c631f9b26 100644
--- a/phpBB/templates/subSilver/admin/forum_admin_body.tpl
+++ b/phpBB/templates/subSilver/admin/forum_admin_body.tpl
@@ -13,7 +13,7 @@
 		<td class="cat" align="center" valign="middle"><span class="gen"><a href="{catrow.U_CAT_EDIT}">{L_EDIT}</a></span></td>
 		<td class="cat" align="center" valign="middle"><span class="gen"><a href="{catrow.U_CAT_DELETE}">{L_DELETE}</a></span></td>
 		<td class="cat" align="center" valign="middle" nowrap="nowrap"><span class="gen"><a href="{catrow.U_CAT_MOVE_UP}">{L_MOVE_UP}</a> <a href="{catrow.U_CAT_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td>
-		<td class="catRight" align="center" valign="middle"><span class="gen">&nbsp</span></td>
+		<td class="catRight" align="center" valign="middle"><span class="gen">&nbsp;</span></td>
 	</tr>
 	<!-- BEGIN forumrow -->
 	<tr>