diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings
index e9740ce92..878679130 100644
--- a/UI/MailerUI/Dutch.lproj/Localizable.strings
+++ b/UI/MailerUI/Dutch.lproj/Localizable.strings
@@ -169,6 +169,7 @@
 "View Message Source" = "Bron bekijken";
 "Print..." = "Afdrukken...";
 "Delete Message" = "Bericht verwijderen";
+"Delete Selected Messages" = "Delete Selected Messages";
 
 "This Folder" = "Deze map";
 
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 13ab1be61..0d484d02c 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -185,6 +185,7 @@
 "View Message Source" = "View Message Source";
 "Print..." = "Print...";
 "Delete Message" = "Delete Message";
+"Delete Selected Messages" = "Delete Selected Messages";
 
 "This Folder" = "This Folder";
 
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index ed775da32..75117f549 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -186,6 +186,7 @@
 "View Message Source" = "Voir le code source";
 "Print..." = "Imprimer...";
 "Delete Message" = "Supprimer le message";
+"Delete Selected Messages" = "Supprimer les messages sélectionnés";
 
 "This Folder" = "Ce dossier-ci";
 
diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings
index b1c61b0bd..ecf0164fb 100644
--- a/UI/MailerUI/Italian.lproj/Localizable.strings
+++ b/UI/MailerUI/Italian.lproj/Localizable.strings
@@ -192,6 +192,7 @@
 "View Message Source" = "Visualizza sorgente";
 "Print..." = "Stampa...";
 "Delete Message" = "Cancella messaggio";
+"Delete Selected Messages" = "Delete Selected Messages";
 
 "This Folder" = "This Folder";
 
diff --git a/UI/MailerUI/Spanish.lproj/Localizable.strings b/UI/MailerUI/Spanish.lproj/Localizable.strings
index 3cad5cc2f..f0eb1407e 100644
--- a/UI/MailerUI/Spanish.lproj/Localizable.strings
+++ b/UI/MailerUI/Spanish.lproj/Localizable.strings
@@ -188,6 +188,7 @@
 "View Message Source" = "Ver formato original del mensaje";
 "Print..." = "Imprimir...";
 "Delete Message" = "Borrar mensaje";
+"Delete Selected Messages" = "Delete Selected Messages";
 
 "This Folder" = "Esta carpeta";
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 4481863e2..0cd6b9be3 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -155,10 +155,10 @@ function extractEmailName(mailTo) {
   var tmpMailTo = mailTo.replace("&lt;", "<");
   tmpMailTo = tmpMailTo.replace("&gt;", ">");
 
-  var emailNamere = /([^ 	]+)\ </;
+  var emailNamere = /([ 	]+)?(.+)\ </;
   if (emailNamere.test(tmpMailTo)) {
     emailNamere.exec(tmpMailTo);
-    emailName = RegExp.$1;
+    emailName = RegExp.$2;
   }
    
   return emailName;
@@ -185,7 +185,7 @@ function sanitizeMailTo(dirtyMailTo) {
     mailto = emailName + ' <' + email + '>';
   else
     mailto = email;
-
+  
   return mailto;
 }