diff --git a/Changes b/Changes
index f695d2ca3..d9d101e5d 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Anope Version 1.8 - SVN
 4/16  F Fixed missing TS6SID on FJOIN in inspircd12                      [  #00]
 4/19  F Fixed ns_info to show nick expire times to opers not only admins [  #00]
 4/28  F Fixed a bug that could make some nick requests disappear         [  #00]
+5/18  F Fixed English and grammar in e-mail messages                     [  #00]
 
 Anope Version 1.8.4
 -------------------
diff --git a/lang/en_us.l b/lang/en_us.l
index b4203e72f..94569f738 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -879,13 +879,13 @@ NICK_SENDPASS_HEAD
 NICK_SENDPASS_LINE_1
 	You have requested to receive the password of nickname %s by e-mail.
 NICK_SENDPASS_LINE_2
-	The password is %s for security purposes, you should change it as soon as you receive this mail.
+	The password is %s. For security reasons, you should change it as soon as possible.
 NICK_SENDPASS_LINE_3
-	If you don't know why this mail is sent to you, please ignore it silently.
+	If you don't know why this email has been sent to you, please ignore it.
 NICK_SENDPASS_LINE_4
-	PLEASE DON'T ANSWER TO THIS MAIL!
+	This mailbox is not monitored. Replies to this e-mail will NOT be responded to.
 NICK_SENDPASS_LINE_5
-	%s administrators.
+	Thanks for using %s
 NICK_SENDPASS_OK
 	Password of %s has been sent.
 
@@ -935,15 +935,15 @@ NICK_REG_MAIL_SUBJECT
 NICK_REG_MAIL_HEAD
 	Hi,
 NICK_REG_MAIL_LINE_1
-	You have requested to register the following nickname %s.
+	You have requested to register the nickname "%s".
 NICK_REG_MAIL_LINE_2
-	Please type " %R%s confirm %s " to complete registration.
+	Please type " %R%s confirm %s " into your IRC client to complete the registration.
 NICK_REG_MAIL_LINE_3
-	If you don't know why this mail is sent to you, please ignore it silently.
+	If you don't know why this mail has been sent to you, please ignore it.
 NICK_REG_MAIL_LINE_4
-	PLEASE DON'T ANSWER TO THIS MAIL!
+	This mailbox is not monitored. Replies to this e-mail will NOT get responded to.
 NICK_REG_MAIL_LINE_5
-	%s administrators.
+	Thanks for using %s
 NICK_GETPASS_PASSCODE_IS
 	Passcode for %s is %s.
 NICK_FORCE_REG
@@ -1680,13 +1680,13 @@ CHAN_SENDPASS_HEAD
 CHAN_SENDPASS_LINE_1
 	You have requested to receive the password of channel %s by e-mail.
 CHAN_SENDPASS_LINE_2
-	The password is %s. For security reasons, you should change it as soon as you receive this mail.
+	The password is %s. For security reasons, you should change it as soon as possible.
 CHAN_SENDPASS_LINE_3
-	If you don't know why this mail is sent to you, please ignore it silently.
+	If you don't know why this mail has been sent to you, please ignore it.
 CHAN_SENDPASS_LINE_4
-	PLEASE DON'T ANSWER TO THIS MAIL!
+	This mailbox is not monitored. Replies to this e-mail will NOT be responded to.
 CHAN_SENDPASS_LINE_5
-	%s administrators.
+	Thanks for using %s
 CHAN_SENDPASS_OK
 	Password of %s has been sent.
 
@@ -1970,9 +1970,9 @@ MEMO_MAIL_SUBJECT
 MEMO_MAIL_TEXT1
 	Hi %s
 MEMO_MAIL_TEXT2
-	You've just received a new memo from %s. This is memo number %d.
+	You have just received a new memo from %s. This is memo number %d.
 MEMO_MAIL_TEXT3
-	Memo Text:
+	The text of the memo is:
 
 # RSEND responses
 MEMO_RSEND_PLEASE_WAIT
diff --git a/version.log b/version.log
index 19a153965..0fd31d0d8 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="4"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2963"
+VERSION_BUILD="2966"
 
 # $Log$ # Changes since the 1.8.4 Release
+#Revision 2966 - Fixed English in e-mail messages
 #Revision 2962 - Fixed bug with r2952 (%s was used rather than %d)
 #Revision 2952 - Added a tonne of alog()s to log all stateful commands
 #Revision 2950 - Added support for building with Microsoft Visual Studio 2010 and removed support for Microsoft Visual Studio 98