diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 370a4a8ee..3a1f38498 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -260,8 +260,11 @@
 "error_missingrecipients" = "Please specify at least one recipient.";
 "Send Anyway" = "Send Anyway";
 "Error while saving the draft" = "Error while saving the draft";
+
+/* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Error while uploading the file \"%{0}\":";
 "There is an active file upload. Closing the window will interrupt it." = "There is an active file upload. Closing the window will interrupt it.";
+
 /* Message sending */
 "cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
 "cannot send message (smtp) - recipients discarded" = "Cannot send message. The following addresses are invalid";
@@ -302,7 +305,4 @@
 "More search options" = "More search options";
 "Your email has been saved" = "Your email has been saved";
 "Your email has been sent" = "Your email has been sent";
-"Folder compacted" = "Folder compacted";
-
-/* Error when uploading a file attachment */
-"An error occured while uploading" = "An error occured while uploading";
+"Folder compacted" = "Folder compacted";
\ No newline at end of file
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index 2c49399a5..8c39297d0 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -46,7 +46,7 @@
       onErrorItem: function(item, response, status, headers) {
         $mdToast.show(
           $mdToast.simple()
-            .content(l('An error occured while uploading' + ' ' + item.file.name))
+            .content(l('Error while uploading the file \"%{0}\":', item.file.name))
             .position('top right')
             .hideDelay(3000));
         this.removeFromQueue(item);