diff --git a/apps/syndie/jsp/viewattachment.jsp b/apps/syndie/jsp/viewattachment.jsp
index 0a0f0c7e4a1cdb82ae2fc1728d23a9a9e41baca0..a8e76171b734ffc1880c122e809565f79aaf46db 100644
--- a/apps/syndie/jsp/viewattachment.jsp
+++ b/apps/syndie/jsp/viewattachment.jsp
@@ -6,9 +6,9 @@ response.setContentType(ArchiveViewerBean.getAttachmentContentType(params));
 boolean inline = ArchiveViewerBean.getAttachmentShouldShowInline(params);
 String filename = ArchiveViewerBean.getAttachmentFilename(params);
 if (inline)
-  response.setHeader("Content-Disposition", "inline; filename=" + filename);
+  response.setHeader("Content-Disposition", "inline; filename=\"" + filename + "\"");
 else
-  response.setHeader("Content-Disposition", "attachment; filename=" + filename);
+  response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\"");
 int len = ArchiveViewerBean.getAttachmentContentLength(params);
 if (len >= 0)
   response.setContentLength(len);