diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php
index bd423be05d..3d5c471f27 100644
--- a/phpBB/admin/admin_board.php
+++ b/phpBB/admin/admin_board.php
@@ -151,6 +151,7 @@ $template->assign_vars(array(
 	"L_ENABLED" => $lang['Enabled'], 
 	"L_DISABLED" => $lang['Disabled'], 
 	"L_ABILITIES_SETTINGS" => $lang['Abilities_settings'],
+	"L_MAX_POLL_OPTIONS" => $lang['Max_poll_options'],
 	"L_FLOOD_INTERVAL" => $lang['Flood_Interval'],
 	"L_FLOOD_INTERVAL_EXPLAIN" => $lang['Flood_Interval_explain'], 
 	"L_BOARD_EMAIL_FORM" => $lang['Board_email_form'], 
@@ -216,6 +217,7 @@ $template->assign_vars(array(
 	"ACTIVATION_ADMIN_CHECKED" => $activation_admin, 
 	"BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, 
 	"BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, 
+	"MAX_POLL_OPTIONS" => $new['max_poll_options'], 
 	"FLOOD_INTERVAL" => $new['flood_interval'],
 	"TOPICS_PER_PAGE" => $new['topics_per_page'],
 	"POSTS_PER_PAGE" => $new['posts_per_page'],
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 1915b56c68..89d0930d62 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -32,6 +32,9 @@ $lang['Database_size'] = "Database size";
 $lang['Gzip_compression'] ="Gzip compression";
 $lang['Not_available'] = "Not available";
 
+$lang['ON'] = "ON"; // This is for GZip compression
+$lang['OFF'] = "OFF"; 
+
 
 //
 // DB Utils
@@ -185,6 +188,7 @@ $lang['Board_disable_explain'] = "This will make the board unavailable to users.
 $lang['Acct_activation'] = "Enable account activation";
 
 $lang['Abilities_settings'] = "User and Forum Basic Settings";
+$lang['Max_poll_options'] = "Max number of poll options";
 $lang['Flood_Interval'] = "Flood Interval";
 $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; 
 $lang['Board_email_form'] = "User email via board";
diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl
index 85f2ae3456..e76877cad2 100644
--- a/phpBB/templates/subSilver/admin/board_config_body.tpl
+++ b/phpBB/templates/subSilver/admin/board_config_body.tpl
@@ -9,11 +9,11 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_SITE_NAME}</td>
-		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_SITE_DESCRIPTION}</td>
-		<td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="{SITE_DESCRIPTION}"></td>
+		<td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="{SITE_DESCRIPTION}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_DISABLE_BOARD}<br /><span class="gensmall">{L_DISABLE_BOARD_EXPLAIN}</span></td>
@@ -29,19 +29,19 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_FLOOD_INTERVAL} <br /><span class="gensmall">{L_FLOOD_INTERVAL_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td>
+		<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_TOPICS_PER_PAGE}</td>
-		<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td>
+		<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_POSTS_PER_PAGE}</td>
-		<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td>
+		<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_HOT_THRESHOLD}</td>
-		<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td>
+		<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_DEFAULT_STYLE}</td>
@@ -57,7 +57,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_DATE_FORMAT}<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td>
+		<td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_SYSTEM_TIMEZONE}</td>
@@ -79,19 +79,19 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_COOKIE_NAME}</span></td>
-		<td class="row2"><input type="text" maxlength="16" name="cookie_name" value="{COOKIE_NAME}"></td>
+		<td class="row2"><input type="text" maxlength="16" name="cookie_name" value="{COOKIE_NAME}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_COOKIE_DOMAIN}</span></td>
-		<td class="row2"><input type="text" maxlength="50" name="cookie_domain" value="{COOKIE_DOMAIN}"></td>
+		<td class="row2"><input type="text" maxlength="50" name="cookie_domain" value="{COOKIE_DOMAIN}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_COOKIE_PATH}</span></td>
-		<td class="row2"><input type="text" maxlength="20" name="cookie_path" value="{COOKIE_PATH}"></td>
+		<td class="row2"><input type="text" maxlength="20" name="cookie_path" value="{COOKIE_PATH}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_SESSION_LENGTH}</span></td>
-		<td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="{SESSION_LENGTH}"></td>
+		<td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="{SESSION_LENGTH}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_COOKIE_SECURE}</td>
@@ -106,26 +106,30 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_INBOX_LIMIT}</span></td>
-		<td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}"></td>
+		<td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_SENTBOX_LIMIT}</span></td>
-		<td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}"></td>
+		<td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_SAVEBOX_LIMIT}</span></td>
-		<td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}"></td>
+		<td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}" /></td>
 	</tr>
 	<tr>
 	  <th class="thHead" colspan="2">{L_ABILITIES_SETTINGS}</th>
 	</tr>
+	<tr>
+		<td class="row1">{L_MAX_POLL_OPTIONS}</td>
+		<td class="row2"><input type="text" name="max_poll_options" size="4" maxlength="4" value="{MAX_POLL_OPTIONS}" /></td>
+	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_HTML}</td>
 		<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" {HTML_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOWED_TAGS}<br /><span class="gensmall">{L_ALLOWED_TAGS_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}"></td>
+		<td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_BBCODE}</td>
@@ -137,7 +141,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_SMILIES_PATH} <br /><span class="gensmall">{L_SMILIES_PATH_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td>
+		<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_SIG}</td>
@@ -145,7 +149,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_MAX_SIG_LENGTH}<br /><span class="gensmall">{L_MAX_SIG_LENGTH_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td>
+		<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}" /></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_ALLOW_NAME_CHANGE}</td>
@@ -168,13 +172,13 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_MAX_FILESIZE}<br /><span class="gensmall">{L_MAX_FILESIZE_EXPLAIN}</span></td>
-		<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td>
+		<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}" /> Bytes</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_MAX_AVATAR_SIZE} <br />
 			<span class="gensmall">{L_MAX_AVATAR_SIZE_EXPLAIN}</span>
 		</td>
-		<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
+		<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}" /> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_AVATAR_STORAGE_PATH} <br /><span class="gensmall">{L_AVATAR_STORAGE_PATH_EXPLAIN}</span></td>