diff --git a/models/activities.js b/models/activities.js
index 1e97895de..a4a48284b 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -166,7 +166,8 @@ if (Meteor.isServer) {
     }
     if (activity.attachmentId) {
       const attachment = activity.attachment();
-      params.attachment = attachment._id;
+      params.attachment = attachment.original.name;
+      params.attachmentId = attachment._id;
     }
     if (activity.checklistId) {
       const checklist = activity.checklist();
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index 307445559..655fe824b 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -18,7 +18,7 @@ Meteor.methods({
 
     // label activity did not work yet, see wekan/models/activities.js
     const quoteParams = _.clone(params);
-    ['card', 'list', 'oldList', 'board', 'oldBoard', 'comment', 'checklist', 'swimlane', 'oldSwimlane', 'label'].forEach((key) => {
+    ['card', 'list', 'oldList', 'board', 'oldBoard', 'comment', 'checklist', 'swimlane', 'oldSwimlane', 'label', 'attachment'].forEach((key) => {
       if (quoteParams[key]) quoteParams[key] = `"${params[key]}"`;
     });