diff --git a/admin_bans.php b/admin_bans.php
index 3c53c946c..079a2592e 100644
--- a/admin_bans.php
+++ b/admin_bans.php
@@ -188,10 +188,10 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('E-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Email label') ?></th>
 									<td>
 										<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban_email)) echo $ban_email; ?>" tabindex="3" />
-										<span><?php echo $lang->t('E-mail help') ?></span>
+										<span><?php echo $lang->t('Email help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -321,7 +321,7 @@
 	if ($ban_email != '' && !is_valid_email($ban_email))
 	{
 		if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$%', $ban_email))
-			message($lang->t('Invalid e-mail message'));
+			message($lang->t('Invalid email message'));
 	}
 
 	if ($ban_expire != '' && $ban_expire != 'Never')
@@ -497,7 +497,7 @@
 			<thead>
 				<tr>
 					<th class="tcl" scope="col"><?php echo $lang->t('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo $lang->t('Results e-mail head') ?></th>
+					<th class="tc2" scope="col"><?php echo $lang->t('Results email head') ?></th>
 					<th class="tc3" scope="col"><?php echo $lang->t('Results IP address head') ?></th>
 					<th class="tc4" scope="col"><?php echo $lang->t('Results expire head') ?></th>
 					<th class="tc5" scope="col"><?php echo $lang->t('Results message head') ?></th>
@@ -619,7 +619,7 @@
 									<td><input type="text" name="form[ip]" size="30" maxlength="255" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('E-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Email label') ?></th>
 									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="6" /></td>
 								</tr>
 								<tr>
@@ -642,7 +642,7 @@
 										<select name="order_by" tabindex="10">
 											<option value="username" selected="selected"><?php echo $lang->t('Order by username') ?></option>
 											<option value="ip"><?php echo $lang->t('Order by ip') ?></option>
-											<option value="email"><?php echo $lang->t('Order by e-mail') ?></option>
+											<option value="email"><?php echo $lang->t('Order by email') ?></option>
 											<option value="expire"><?php echo $lang->t('Order by expire') ?></option>
 										</select>&#160;&#160;&#160;<select name="direction" tabindex="11">
 											<option value="ASC" selected="selected"><?php echo $lang->t('Ascending') ?></option>
diff --git a/admin_groups.php b/admin_groups.php
index e13af4b13..f40197eb7 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -207,10 +207,10 @@
 									</td>
 								</tr>
 <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang->t('Send e-mails label') ?></th>
+									<th scope="row"><?php echo $lang->t('Send emails label') ?></th>
 									<td>
 										<input type="radio" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> tabindex="33" />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="send_email" value="0"<?php if ($group['g_send_email'] == '0') echo ' checked="checked"' ?> tabindex="34" />&#160;<strong><?php echo $lang->t('No') ?></strong>
-										<span><?php echo $lang->t('Send e-mails help') ?></span>
+										<span><?php echo $lang->t('Send emails help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
@@ -228,10 +228,10 @@
 									</td>
 								</tr>
 <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang->t('E-mail flood label') ?></th>
+									<th scope="row"><?php echo $lang->t('Email flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" tabindex="37" />
-										<span><?php echo $lang->t('E-mail flood help') ?></span>
+										<span><?php echo $lang->t('Email flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/admin_options.php b/admin_options.php
index 1a996419a..582c72d3d 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -106,10 +106,10 @@
 	require PUN_ROOT.'include/email.php';
 
 	if (!is_valid_email($form['admin_email']))
-		message($lang->t('Invalid admin e-mail message'));
+		message($lang->t('Invalid admin email message'));
 
 	if (!is_valid_email($form['webmaster_email']))
-		message($lang->t('Invalid webmaster e-mail message'));
+		message($lang->t('Invalid webmaster email message'));
 
 	if ($form['mailing_list'] != '')
 		$form['mailing_list'] = strtolower(preg_replace('%\s%S', '', $form['mailing_list']));
@@ -602,7 +602,7 @@
 								<tr>
 									<th scope="row"><?php echo $lang->t('Reporting method label') ?></th>
 									<td>
-										<input type="radio" name="form[report_method]" value="0"<?php if ($pun_config['o_report_method'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Internal') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="1"<?php if ($pun_config['o_report_method'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('By e-mail') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="2"<?php if ($pun_config['o_report_method'] == '2') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Both') ?></strong>
+										<input type="radio" name="form[report_method]" value="0"<?php if ($pun_config['o_report_method'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Internal') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="1"<?php if ($pun_config['o_report_method'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('By email') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="2"<?php if ($pun_config['o_report_method'] == '2') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Both') ?></strong>
 										<span><?php echo $lang->t('Reporting method help') ?></span>
 									</td>
 								</tr>
@@ -663,21 +663,21 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang->t('E-mail subhead') ?></legend>
+						<legend><?php echo $lang->t('Email subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop" cellspacing="0">
 								<tr>
-									<th scope="row"><?php echo $lang->t('Admin e-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Admin email label') ?></th>
 									<td>
 										<input type="text" name="form[admin_email]" size="50" maxlength="80" value="<?php echo $pun_config['o_admin_email'] ?>" />
-										<span><?php echo $lang->t('Admin e-mail help') ?></span>
+										<span><?php echo $lang->t('Admin email help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('Webmaster e-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Webmaster email label') ?></th>
 									<td>
 										<input type="text" name="form[webmaster_email]" size="50" maxlength="80" value="<?php echo $pun_config['o_webmaster_email'] ?>" />
-										<span><?php echo $lang->t('Webmaster e-mail help') ?></span>
+										<span><?php echo $lang->t('Webmaster email help') ?></span>
 									</td>
 								</tr>
 								<tr>
@@ -770,10 +770,10 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('E-mail default label') ?></th>
+									<th scope="row"><?php echo $lang->t('Email default label') ?></th>
 									<td>
-										<span><?php echo $lang->t('E-mail default help') ?></span>
-										<input type="radio" name="form[default_email_setting]" value="0"<?php if ($pun_config['o_default_email_setting'] == '0') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Display e-mail label') ?><br />
+										<span><?php echo $lang->t('Email default help') ?></span>
+										<input type="radio" name="form[default_email_setting]" value="0"<?php if ($pun_config['o_default_email_setting'] == '0') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Display email label') ?><br />
 										<input type="radio" name="form[default_email_setting]" value="1"<?php if ($pun_config['o_default_email_setting'] == '1') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Hide allow form label') ?><br />
 										<input type="radio" name="form[default_email_setting]" value="2"<?php if ($pun_config['o_default_email_setting'] == '2') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Hide both label') ?><br />
 									</td>
diff --git a/admin_permissions.php b/admin_permissions.php
index 547f9e3e2..7a7b084cb 100644
--- a/admin_permissions.php
+++ b/admin_permissions.php
@@ -96,10 +96,10 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('Require e-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Require email label') ?></th>
 									<td>
 										<input type="radio" name="form[force_guest_email]" value="1"<?php if ($pun_config['p_force_guest_email'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[force_guest_email]" value="0"<?php if ($pun_config['p_force_guest_email'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('No') ?></strong>
-										<span><?php echo $lang->t('Require e-mail help') ?></span>
+										<span><?php echo $lang->t('Require email help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -156,17 +156,17 @@
 						<div class="infldset">
 							<table class="aligntop" cellspacing="0">
 								<tr>
-									<th scope="row"><?php echo $lang->t('Banned e-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Banned email label') ?></th>
 									<td>
 										<input type="radio" name="form[allow_banned_email]" value="1"<?php if ($pun_config['p_allow_banned_email'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[allow_banned_email]" value="0"<?php if ($pun_config['p_allow_banned_email'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('No') ?></strong>
-										<span><?php echo $lang->t('Banned e-mail help') ?></span>
+										<span><?php echo $lang->t('Banned email help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('Duplicate e-mail label') ?></th>
+									<th scope="row"><?php echo $lang->t('Duplicate email label') ?></th>
 									<td>
 										<input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($pun_config['p_allow_dupe_email'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($pun_config['p_allow_dupe_email'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('No') ?></strong>
-										<span><?php echo $lang->t('Duplicate e-mail help') ?></span>
+										<span><?php echo $lang->t('Duplicate email help') ?></span>
 									</td>
 								</tr>
 							</table>
diff --git a/admin_users.php b/admin_users.php
index e479e95be..5db13cdc2 100644
--- a/admin_users.php
+++ b/admin_users.php
@@ -193,7 +193,7 @@
 			<thead>
 				<tr>
 					<th class="tcl" scope="col"><?php echo $lang->t('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo $lang->t('Results e-mail head') ?></th>
+					<th class="tc2" scope="col"><?php echo $lang->t('Results email head') ?></th>
 					<th class="tc3" scope="col"><?php echo $lang->t('Results title head') ?></th>
 					<th class="tc4" scope="col"><?php echo $lang->t('Results posts head') ?></th>
 					<th class="tc5" scope="col"><?php echo $lang->t('Results admin note head') ?></th>
@@ -1049,7 +1049,7 @@
 			<thead>
 				<tr>
 					<th class="tcl" scope="col"><?php echo $lang->t('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo $lang->t('Results e-mail head') ?></th>
+					<th class="tc2" scope="col"><?php echo $lang->t('Results email head') ?></th>
 					<th class="tc3" scope="col"><?php echo $lang->t('Results title head') ?></th>
 					<th class="tc4" scope="col"><?php echo $lang->t('Results posts head') ?></th>
 					<th class="tc5" scope="col"><?php echo $lang->t('Results admin note head') ?></th>
@@ -1157,7 +1157,7 @@
 									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang->t('E-mail address label') ?></th>
+									<th scope="row"><?php echo $lang->t('Email address label') ?></th>
 									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
 								</tr>
 								<tr>
@@ -1247,7 +1247,7 @@
 									<td>
 										<select name="order_by" tabindex="21">
 											<option value="username" selected="selected"><?php echo $lang->t('Order by username') ?></option>
-											<option value="email"><?php echo $lang->t('Order by e-mail') ?></option>
+											<option value="email"><?php echo $lang->t('Order by email') ?></option>
 											<option value="num_posts"><?php echo $lang->t('Order by posts') ?></option>
 											<option value="last_post"><?php echo $lang->t('Order by last post') ?></option>
 											<option value="last_visit"><?php echo $lang->t('Order by last visit') ?></option>
diff --git a/lang/English/admin_bans.po b/lang/English/admin_bans.po
index 5ea6e025e..de536d9c3 100644
--- a/lang/English/admin_bans.po
+++ b/lang/English/admin_bans.po
@@ -32,7 +32,7 @@ msgstr "The guest user cannot be banned."
 msgid "Invalid IP message"
 msgstr "You entered an invalid IP/IP-range."
 
-msgid "Invalid e-mail message"
+msgid "Invalid email message"
 msgstr "The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid."
 
 msgid "Invalid date message"
@@ -95,7 +95,7 @@ msgstr "Username"
 msgid "Order by ip"
 msgstr "IP"
 
-msgid "Order by e-mail"
+msgid "Order by email"
 msgstr "Email"
 
 msgid "Order by expire"
@@ -110,10 +110,10 @@ msgstr "Descending"
 msgid "Submit search"
 msgstr "Submit search"
 
-msgid "E-mail label"
+msgid "Email label"
 msgstr "Email"
 
-msgid "E-mail help"
+msgid "Email help"
 msgstr "The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See \"Allow banned email addresses\" in Permissions for more info."
 
 msgid "IP label"
@@ -155,7 +155,7 @@ msgstr "Search Results"
 msgid "Results username head"
 msgstr "Username"
 
-msgid "Results e-mail head"
+msgid "Results email head"
 msgstr "Email"
 
 msgid "Results IP address head"
@@ -177,5 +177,4 @@ msgid "No match"
 msgstr "No match"
 
 msgid "Unknown"
-msgstr "Unknown"
-
+msgstr "Unknown"
\ No newline at end of file
diff --git a/lang/English/admin_groups.po b/lang/English/admin_groups.po
index f2144f8ed..917cc0a4a 100644
--- a/lang/English/admin_groups.po
+++ b/lang/English/admin_groups.po
@@ -203,11 +203,11 @@ msgstr "Search user list"
 msgid "User list search help"
 msgstr "Allow users in this group to freetext search for users in the user list."
 
-msgid "Send e-mails label"
-msgstr "Send e-mails"
+msgid "Send emails label"
+msgstr "Send emails"
 
-msgid "Send e-mails help"
-msgstr "Allow users in this group to send e-mails to other users."
+msgid "Send emails help"
+msgstr "Allow users in this group to send emails to other users."
 
 msgid "Post flood label"
 msgstr "Post flood interval"
@@ -221,10 +221,10 @@ msgstr "Search flood interval"
 msgid "Search flood help"
 msgstr "Number of seconds that users in this group have to wait between searches. Set to 0 to disable."
 
-msgid "E-mail flood label"
+msgid "Email flood label"
 msgstr "Email flood interval"
 
-msgid "E-mail flood help"
+msgid "Email flood help"
 msgstr "Number of seconds that users in this group have to wait between emails. Set to 0 to disable."
 
 msgid "Report flood label"
@@ -234,5 +234,4 @@ msgid "Report flood help"
 msgstr "Number of seconds that users in this group have to wait between reports. Set to 0 to disable."
 
 msgid "Moderator info"
-msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
-
+msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
\ No newline at end of file
diff --git a/lang/English/admin_options.po b/lang/English/admin_options.po
index 4ff69ce0b..ad4bbbfcf 100644
--- a/lang/English/admin_options.po
+++ b/lang/English/admin_options.po
@@ -17,10 +17,10 @@ msgstr "Bad HTTP_REFERER. If you have moved these forums from one location to an
 msgid "Must enter title message"
 msgstr "You must enter a board title."
 
-msgid "Invalid admin e-mail message"
+msgid "Invalid admin email message"
 msgstr "The admin email address you entered is invalid."
 
-msgid "Invalid webmaster e-mail message"
+msgid "Invalid webmaster email message"
 msgstr "The webmaster email address you entered is invalid."
 
 msgid "SMTP passwords did not match"
@@ -423,7 +423,7 @@ msgstr "Reporting method"
 msgid "Internal"
 msgstr "Internal"
 
-msgid "By e-mail"
+msgid "By email"
 msgstr "Email"
 
 msgid "Both"
@@ -472,20 +472,20 @@ msgstr "Max size"
 msgid "Max size help"
 msgstr "The maximum allowed size of avatars in bytes (10240 is recommended)."
 
-# E-mail section
-msgid "E-mail subhead"
+# Email section
+msgid "Email subhead"
 msgstr "Email"
 
-msgid "Admin e-mail label"
+msgid "Admin email label"
 msgstr "Admin email"
 
-msgid "Admin e-mail help"
+msgid "Admin email help"
 msgstr "The email address of the board administrator."
 
-msgid "Webmaster e-mail label"
+msgid "Webmaster email label"
 msgstr "Webmaster email"
 
-msgid "Webmaster e-mail help"
+msgid "Webmaster email help"
 msgstr "This is the address that all emails sent by the board will be addressed from."
 
 msgid "Forum subscriptions label"
@@ -561,17 +561,17 @@ msgstr "Enter your rules here"
 msgid "Rules help"
 msgstr "Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML."
 
-msgid "E-mail default label"
+msgid "Email default label"
 msgstr "Default email setting"
 
-msgid "E-mail default help"
+msgid "Email default help"
 msgstr "Choose the default privacy setting for new user registrations."
 
-msgid "Display e-mail label"
+msgid "Display email label"
 msgstr "Display email address to other users."
 
 msgid "Hide allow form label"
-msgstr "Hide email address but allow form e-mail."
+msgstr "Hide email address but allow form email."
 
 msgid "Hide both label"
 msgstr "Hide email address and disallow form email."
@@ -606,5 +606,4 @@ msgid "Maintenance message label"
 msgstr "Maintenance message"
 
 msgid "Maintenance message help"
-msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."
-
+msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."
\ No newline at end of file
diff --git a/lang/English/admin_permissions.po b/lang/English/admin_permissions.po
index 70ab585f8..1b14bf2d4 100644
--- a/lang/English/admin_permissions.po
+++ b/lang/English/admin_permissions.po
@@ -44,10 +44,10 @@ msgstr "All caps subject"
 msgid "All caps subject help"
 msgstr "Allow a subject to contain only capital letters."
 
-msgid "Require e-mail label"
+msgid "Require email label"
 msgstr "Require guest email"
 
-msgid "Require e-mail help"
+msgid "Require email help"
 msgstr "Require guests to supply an email address when posting."
 
 msgid "Signatures subhead"
@@ -86,15 +86,14 @@ msgstr "The maximum number of lines a user signature may contain."
 msgid "Registration subhead"
 msgstr "Registration"
 
-msgid "Banned e-mail label"
+msgid "Banned email label"
 msgstr "Allow banned email addresses"
 
-msgid "Banned e-mail help"
+msgid "Banned email help"
 msgstr "Allow users to register with or change to a banned email address/domain. If left at its default setting (yes), this action will be allowed, but an alert email will be sent to the mailing list (an effective way of detecting multiple registrations)."
 
-msgid "Duplicate e-mail label"
+msgid "Duplicate email label"
 msgstr "Allow duplicate email addresses"
 
-msgid "Duplicate e-mail help"
+msgid "Duplicate email help"
 msgstr "Controls whether users should be allowed to register with an email address that another user already has. If allowed, an alert email will be sent to the mailing list if a duplicate is detected."
-
diff --git a/lang/English/admin_users.po b/lang/English/admin_users.po
index 623eb22f4..d499349ba 100644
--- a/lang/English/admin_users.po
+++ b/lang/English/admin_users.po
@@ -117,7 +117,7 @@ msgstr "Search for users in the database. You can enter one or more terms to sea
 msgid "Username label"
 msgstr "Username"
 
-msgid "E-mail address label"
+msgid "Email address label"
 msgstr "Email address"
 
 msgid "Title label"
@@ -186,7 +186,7 @@ msgstr "Order by"
 msgid "Order by username"
 msgstr "Username"
 
-msgid "Order by e-mail"
+msgid "Order by email"
 msgstr "Email"
 
 msgid "Order by posts"
@@ -240,7 +240,7 @@ msgstr "Search Results"
 msgid "Results username head"
 msgstr "Username"
 
-msgid "Results e-mail head"
+msgid "Results email head"
 msgstr "Email"
 
 msgid "Results title head"
@@ -307,5 +307,4 @@ msgid "Results no IP found"
 msgstr "The supplied IP address could not be found in the database."
 
 msgid "No match"
-msgstr "No match"
-
+msgstr "No match"
\ No newline at end of file
diff --git a/modules/database b/modules/database
index 543dd57d8..ef04e4061 160000
--- a/modules/database
+++ b/modules/database
@@ -1 +1 @@
-Subproject commit 543dd57d8624da8a15d5477e70da27a35945abc8
+Subproject commit ef04e4061057212a076847c81d5cf640e9aa9f6c