diff --git a/NEWS b/NEWS
index 60c038600..3ad0c3c01 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Enhancements
  - [web] fixed visual glitches in Month view with Firefox
  - [web] mail editor can now be expanded horizontally and automatically expands vertically
  - [web] compose a new message inline or in a popup window
+ - [web] allow to select multiple files when uploading attachments (#3999)
 
 Bug fixes
  - [core] remove all alarms before sending IMIP replies (#3925)
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 4ed2cfbbe..7a93d00ec 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -260,7 +260,7 @@
             <md-icon>attach_file</md-icon>
             <!-- <span><var:string label:value="Attach"/></span> -->
           </label>
-          <input id="fileInput" name="fileInput" type="file" class="ng-hide"
+          <input id="fileInput" class="ng-hide" name="fileInput" type="file" multiple="multiple"
                  nv-file-select="nv-file-select"
                  uploader="editor.uploader"/>
           <!--