Merge pull request #4687 from timvandermeij/attachments-content-type

Providing content type for attachment downloads

extensions/firefox/content/PdfStreamConverter.jsm

@@ -274,9 +274,10 @@ ChromeActions.prototype = {
       var listener = {
         extListener: null,
         onStartRequest: function(aRequest, aContext) {
-          this.extListener = extHelperAppSvc.doContent((data.isAttachment ? '' :
+          this.extListener = extHelperAppSvc.doContent(
-                                                        'application/pdf'),
+            (data.isAttachment ? 'application/octet-stream' :
-                                aRequest, frontWindow, false);
+                                 'application/pdf'),
+            aRequest, frontWindow, false);
           this.extListener.onStartRequest(aRequest, aContext);
         },
         onStopRequest: function(aRequest, aContext, aStatusCode) {