diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 34d3c2916..32e9b82a4 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -78,7 +78,8 @@ function validateEditorInput(sender) {
     errortext = errortext + labels.error_missingrecipients + "\n";
   
   if (errortext.length > 0) {
-    alert(labels.error_validationfailed + ":\n" + errortext);
+    alert(labels.error_validationfailed.decodeEntities() + ":\n"
+          + errortext.decodeEntities());
     return false;
   }
   return true;
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 6fea23b2f..77c7483de 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -92,7 +92,8 @@ function validateEditorInput(sender) {
     errortext = errortext + labels.error_missingrecipients + "\n";
   
   if (errortext.length > 0) {
-    alert(labels.error_validationfailed + ":\n" + errortext);
+    alert(labels.error_validationfailed.decodeEntities() + ":\n"
+          + errortext.decodeEntities());
     return false;
   }
   return true;
@@ -329,7 +330,7 @@ function ctxFolderAdd(sender) {
 }
 
 function ctxFolderDelete(sender) {
-  if (!confirm("Delete current folder?"))
+  if (!confirm("Delete current folder?").decodeEntities())
     return false;
   
   // TODO: should use a form-POST or AJAX
@@ -692,7 +693,6 @@ function deleteSelectedMails()
 {
 }
 
-
 /* message menu entries */
 function onMenuOpenMessage(event)
 {