Slightly improved e-mail notifications

4 files changed, 6 insertions, 5 deletions

diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
new file mode 100644
index 000000000..24c154364
--- /dev/null
+++ b/app/views/notification_mailer/_status.text.erb
@@ -0,0 +1,3 @@
+<%= strip_tags(@status.content) %>
+
+<%= TagManager.instance.url_for(@status) %>
diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb
index e8f7c1105..1b6fa274c 100644
--- a/app/views/notification_mailer/favourite.text.erb
+++ b/app/views/notification_mailer/favourite.text.erb
@@ -2,4 +2,4 @@
 
 Your status was favourited by <%= @account.acct %>:
 
-<%= account_stream_entry_url(@me, @status.stream_entry) %>
+<%= render partial: 'status' %>
diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb
index f3582749d..72dc1b009 100644
--- a/app/views/notification_mailer/mention.text.erb
+++ b/app/views/notification_mailer/mention.text.erb
@@ -2,6 +2,4 @@
 
 You were mentioned by <%= @status.account.acct %> in:
 
-<%= strip_tags(@status.content) %>
-
-<%= TagManager.instance.url_for(@status) %>
+<%= render partial: 'status' %>
diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb
index 253b22c1e..2077e949e 100644
--- a/app/views/notification_mailer/reblog.text.erb
+++ b/app/views/notification_mailer/reblog.text.erb
@@ -2,4 +2,4 @@
 
 Your status was reblogged by <%= @account.acct %>:
 
-<%= account_stream_entry_url(@me, @status.stream_entry) %>
+<%= render partial: 'status' %>