diff --git a/phpBB/functions/error.php b/phpBB/functions/error.php
index 1a21ab0023..5bb0b73000 100644
--- a/phpBB/functions/error.php
+++ b/phpBB/functions/error.php
@@ -24,10 +24,18 @@
 
 function error_die($db, $error_code = "", $error_msg = "") 
 {
-   global $template, $phpEx;
+   global $template, $phpEx, $default_lang;
 
    if(!$template->get("overall_header"))
      {
+	if(!empty($default_lang))
+	  {
+	     include('language/lang_'.$default_lang.'.'.$phpEx);
+	  }
+	else
+	  {
+	     include('language/lang_english.'.$phpEx);
+	  }
 	include('page_header.'.$phpEx);
      }
    if(!$error_msg)
diff --git a/phpBB/templates/Default/viewforum_body.tpl b/phpBB/templates/Default/viewforum_body.tpl
index ed97ca03c3..7c00fc65d5 100644
--- a/phpBB/templates/Default/viewforum_body.tpl
+++ b/phpBB/templates/Default/viewforum_body.tpl
@@ -3,7 +3,7 @@
 	  <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
     <tr>
 	    <td>
-	      <table border="0" width="100%" cellpadding="0" cellspacing="1">
+	      <table border="0" width="100%" cellpadding="3" cellspacing="1">
 	        <tr class="tableheader">
 	           <td width="5%">&nbsp;</td>
 	           <td>Topic</td>
diff --git a/phpBB/upgrade_20.php b/phpBB/upgrade_20.php
index 2081b36a07..094cc5dedd 100644
--- a/phpBB/upgrade_20.php
+++ b/phpBB/upgrade_20.php
@@ -417,7 +417,8 @@ Backups completed ok.<P>
 			$forum_id     = $row['forum_id'];
 			$topic_status = $row['topic_status'];
 			$topic_notify = $row['topic_notify'];
-
+		        $forum_id     = $row['forum_id'];
+		   
 			$sql = "insert topics (topic_id, topic_title, topic_poster, topic_time, topic_views, forum_id, topic_status, topic_notify)
 					  values ($topic_id, '$topic_title', $topic_poster, $topic_time, $topic_views, $forum_id, $topic_status, $topic_notify)";
 			mysql_query($sql, $db);
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index efdee4569e..094e5ee61f 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -43,10 +43,6 @@ if(!$result = $db->sql_query($sql))
 	error_die($db, QUERY_ERROR);
 }
 
-$pagetype = "viewforum";
-$page_title = "View Forum - $forum_name";
-include('page_header.'.$phpEx);
-
 //
 // Add checking for private forums here!!
 //
@@ -71,6 +67,9 @@ for($x = 0; $x < $db->sql_numrows($result); $x++)
      $forum_moderators .= ", ";
    $forum_moderators .= "<a href=\"profile.$phpEx?mode=viewprofile&user_id=".$forum_row[$x]["user_id"]."\">".$forum_row[$x]["username"]."</a>";
 }
+$pagetype = "viewforum";
+$page_title = "View Forum - $forum_name";
+include('page_header.'.$phpEx);
 
 $template->set_block("body", "topicrow", "topics");