diff --git a/NEWS b/NEWS
index 80aa5b1c1..8d4d2e018 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ New features
  - [web] show all/only this calendar
  - [web] convert a message to an appointment or a task (#1722)
  - [web] customizable base font size for HTML messages
+ - [web you can now limit the file upload size using the WOMaxUploadSize
+   configuration parameter (integer value in kilobytes) (#3510, #3135)
 
 Enhancements
  - [web] added Junk handling feature from v2
diff --git a/Tests/Integration/teststrings.m b/Tests/Integration/teststrings.m
index 94f98c3a7..0e5bdd0c8 100644
--- a/Tests/Integration/teststrings.m
+++ b/Tests/Integration/teststrings.m
@@ -20,8 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSString.h>
 
-#import <SOGo/NSDictionary+Utilities.h>
+#include <SOGo/NSDictionary+Utilities.h>
 
 static int
 performTest (char *filename)
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index b98565fb2..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,4 +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";
+"Folder compacted" = "Folder compacted";
\ No newline at end of file
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index dcce99e27..bc372eb7b 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -590,6 +590,12 @@ static NSArray *infoKeys = nil;
   request = [context request];
 
   httpBody = [[request httpRequest] body];
+
+  // We got an exception from SOPE - most likely due to
+  // WOMaxUploadSize being reached.
+  if ([httpBody isKindOfClass: [NSException class]])
+    return httpBody;
+
   filenames = [self _scanAttachmentFilenamesInRequest: httpBody];
 
   co = [self clientObject];
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index d6b3e4813..8c39297d0 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -44,6 +44,12 @@
         this.removeFromQueue(item);
       },
       onErrorItem: function(item, response, status, headers) {
+        $mdToast.show(
+          $mdToast.simple()
+            .content(l('Error while uploading the file \"%{0}\":', item.file.name))
+            .position('top right')
+            .hideDelay(3000));
+        this.removeFromQueue(item);
         //console.debug(item); console.debug('error = ' + JSON.stringify(response, undefined, 2));
       }
     });