diff --git a/NEWS b/NEWS
index e8bedbf2a..a508400be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 2.3.9 (2016-XX-XX)
 ------------------
 
+New features
+ - you can now limit the file upload size using the WOMaxUploadSize
+   configuration parameter (integer value in kilobytes) (#3510, #3135)
+
 Enhancements
  - allow resources to prevent invitations (#3410)
  - now support EAS MIME truncation
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index fcc0285ee..661bc1ecf 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -593,6 +593,12 @@ static NSArray *infoKeys = nil;
   if ([[mimeType type] isEqualToString: @"multipart"])
     {
       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];