diff --git a/app/views/mailer/attachments_added.html.erb b/app/views/mailer/attachments_added.html.erb
index 11d1cf54c..32d0ab0ea 100644
--- a/app/views/mailer/attachments_added.html.erb
+++ b/app/views/mailer/attachments_added.html.erb
@@ -1,5 +1,14 @@
 <%= link_to h(@added_to), @added_to_url %><br />
 
-<ul><% @attachments.each do |attachment | %>
-<li><%=h attachment.filename %></li>
-<% end %></ul>
+<ul>
+  <% @attachments.each do |attachment | %>
+      <li>
+        <%= link_to attachment.author, user_activities_url(attachment.author),
+        :style => "color:#1B55A7; float:left;display:block; margin-right:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+        <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
+        <%= link_to truncate(attachment.filename,length: 30,omission: '...'), project_files_url(attachment.project),
+        :style => "color:#1B55A7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+       %>
+      </li>
+  <% end %>
+</ul>
diff --git a/app/views/mailer/attachments_added.text.erb b/app/views/mailer/attachments_added.text.erb
index 28cb8285e..c271c0024 100644
--- a/app/views/mailer/attachments_added.text.erb
+++ b/app/views/mailer/attachments_added.text.erb
@@ -1,4 +1,14 @@
 <%= @added_to %><% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
+- <%= attachment.author %> <%= l(:label_project_mail_upload) %> <%=h attachment.filename %><% end %>
 
 <%= @added_to_url %>
+
+
+<%= link_to h(@added_to), @added_to_url %>
+
+<% @attachments.each do |attachment | %>
+    <%= link_to attachment.author, user_activities_url(attachment.author) %>
+    <%= l(:label_project_mail_upload) %>
+    <%= link_to truncate(attachment.filename,length: 30,omission: '...'), project_files_url(attachment.project) %>
+<% end %>
+
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 324e20cb3..63b256421 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -402,7 +402,7 @@
                             :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
 
-                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value),
+                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project,:token => @token.value),
                             :class => 'wmail_info',
                             :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>