diff --git a/post.php b/post.php
index f830d1a5..5f343ff4 100644
--- a/post.php
+++ b/post.php
@@ -213,7 +213,7 @@
 		
 		// Check string lengths
 		if(strlen($post['name']) > 50) error(sprintf($config['error']['toolong'], 'name'));			
-		if(strlen($post['email']) > 30) error(sprintf($config['error']['toolong'], 'email'));
+		if(strlen($post['email']) > 40) error(sprintf($config['error']['toolong'], 'email'));
 		if(strlen($post['subject']) > 40) error(sprintf($config['error']['toolong'], 'subject'));
 		if(!$mod && strlen($post['body']) > $config['max_body']) error($config['error']['toolongbody']);
 		if(!(!$OP && $post['has_file']) && strlen($post['body']) < 1) error($config['error']['tooshortbody']);
diff --git a/templates/index.html b/templates/index.html
index 10973671..59ce3f54 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -29,7 +29,7 @@
 					Email
 				</th>
 				<td>
-					<input type="text" name="email" size="25" maxlength="30" autocomplete="off" />
+					<input type="text" name="email" size="25" maxlength="40" autocomplete="off" />
 				</td>
 			</tr>
 			<tr>
@@ -37,7 +37,7 @@
 					Subject
 				</th>
 				<td>
-					<input style="float:left;" type="text" name="subject" size="25" maxlength="25" autocomplete="off" />
+					<input style="float:left;" type="text" name="subject" size="25" maxlength="40" autocomplete="off" />
 					<input accesskey="s" style="float:right;" type="submit" name="post" value="{button=New Topic}" />
 				</td>
 			</tr>
diff --git a/templates/thread.html b/templates/thread.html
index 4fff9b88..19434be3 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -30,7 +30,7 @@
 					Email
 				</th>
 				<td>
-					<input type="text" name="email" size="25" maxlength="30" autocomplete="off" />
+					<input type="text" name="email" size="25" maxlength="40" autocomplete="off" />
 				</td>
 			</tr>
 			<tr>
@@ -38,7 +38,7 @@
 					Subject
 				</th>
 				<td>
-					<input style="float:left;" type="text" name="subject" size="25" maxlength="25" autocomplete="off" />
+					<input style="float:left;" type="text" name="subject" size="25" maxlength="40" autocomplete="off" />
 					<input accesskey="s" style="float:right;" type="submit" name="post" value="{button=New Topic}" />
 				</td>
 			</tr>