diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index f41d89e79..06451c99c 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -215,7 +215,7 @@
                 <span class="md-default-theme md-warn md-bg"
                       ng-style="{ width: $chip.progress + '%'}"><!-- progress --></span>
               </span>
-              <span>{{$chip.file.name}}</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>
             </md-chip-template>
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index 09a007500..ea3550b20 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -32,6 +32,7 @@
       onSuccessItem: function(item, response, status, headers) {
         stateMessage.$setUID(response.uid);
         stateMessage.$reload({asDraft: false});
+        item.inlineUrl = response.lastAttachmentAttrs[0].url;
         //console.debug(item); console.debug('success = ' + JSON.stringify(response, undefined, 2));
       },
       onCancelItem: function(item, response, status, headers) {
@@ -88,6 +89,7 @@
           fileItem.progress = 100;
           fileItem.isUploaded = true;
           fileItem.isSuccess = true;
+          fileItem.inlineUrl = vm.message.attachmentAttrs[i].url;
           vm.uploader.queue.push(fileItem);
         }
     }