diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 37af7c5fd6..799fa1025e 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -206,7 +206,7 @@ $template->assign_vars(array(
 	"L_REGISTER" => $lang['Register'],
 	"L_PROFILE" => $lang['Profile'],
 	"L_SEARCH" => $lang['Search'],
-	"L_PRIVATEMSGS" => $lang['Private_msgs'],
+	"L_PRIVATEMSGS" => $lang['Private_messages'],
 	"L_WHO_IS_ONLINE" => $lang['Who_is_Online'],
 	"L_MEMBERLIST" => $lang['Memberlist'],
 	"L_FAQ" => $lang['FAQ'],
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index 5c24707bac..0bfc1f3b8e 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -130,7 +130,6 @@ $lang['Register'] = "Register";
 $lang['Profile'] = "Profile";
 $lang['Edit_profile'] = "Edit your profile";
 $lang['Search'] = "Search";
-$lang['Private_msgs'] = "Private Messages";
 $lang['Memberlist'] = "Memberlist";
 $lang['FAQ'] = "FAQ";
 $lang['Usergroups'] = "Usergroups";
@@ -161,9 +160,12 @@ $lang['Forum_is_locked'] = "Forum is locked";
 //
 // Login
 //
+$lang['Enter_password'] = "Please enter your username and password to login";
 $lang['Login'] = "Login";
 $lang['Logout'] = "Logout";
+
 $lang['Forgotten_password'] = "I forgot my password";
+
 $lang['Log_me_in'] = "Log me on automatically each visit";
 
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 33c82bd544..13ebda63a2 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -788,13 +788,13 @@ for($i = 0; $i < $total_posts; $i++)
 	{
 		$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
 
-		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
+		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Send_private_message'] . "\" border=\"0\" /></a>";
 
 		if( !empty($postrow[$i]['user_viewemail']) )
 		{
 			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $poster_id) : "mailto:" . $postrow[$i]['user_email'];
 
-			$email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " $poster\" border=\"0\" /></a>";
+			$email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
 		}
 		else
 		{