diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 300319aa3..7151d182e 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -237,14 +237,14 @@
               </span>
               <a ng-href="{{$chip.inlineUrl}}" target="_new">{{$chip.file.name}}</a>
               <md-icon ng-class="{ 'md-warn': $chip.isUploading }"
-                       ng-click="editor.removeAttachment($chip)">close</md-icon>
+                       ng-click="editor.removeAttachment($chip, 'fileInput')">close</md-icon>
             </md-chip-template>
           </md-chips>
-          <label class="md-button md-icon-button" for="file-input">
+          <label class="md-button md-icon-button" for="fileInput">
             <md-icon>attach_file</md-icon>
             <!-- <span><var:string label:value="Attach"/></span> -->
           </label>
-          <input id="file-input" name="file-input" type="file" class="ng-hide"
+          <input id="fileInput" name="fileInput" type="file" class="ng-hide"
                  nv-file-select="nv-file-select"
                  uploader="editor.uploader"/>
           <!--
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index d28cf44d6..04de3b3e4 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -134,13 +134,18 @@
         }
     }
 
-    function removeAttachment(item) {
+    function removeAttachment(item, id) {
       if (item.isUploading)
         vm.uploader.cancelItem(item);
       else {
         vm.message.$deleteAttachment(item.file.name);
         item.remove();
       }
+      // Hack to allow adding the same file again
+      // See https://github.com/nervgh/angular-file-upload/issues/671
+      var element = $window.document.getElementById(id);
+      if (element)
+        angular.element(element).prop('value', null);
     }
 
     function cancel() {