diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index bd690c71c..9c7bd6746 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -915,7 +915,10 @@
    * @returns a promise of the HTTP operation
    */
   Message.prototype.download = function() {
-    return Message.$$resource.download(this.$absolutePath(), 'export');
+    var options;
+
+    options = { filename: this.subject + '.eml' };
+    return Message.$$resource.download(this.$absolutePath(), 'export', undefined, options);
   };
 
   /**