diff --git a/rss.template b/rss.template
index 86a0700..b07b582 100644
--- a/rss.template
+++ b/rss.template
@@ -12,11 +12,11 @@
 {{$status := $post}} 
 {{if $status.Retweeted_status}}
 {{$status = $post.Retweeted_status}}
-{{$post.User.Screen_name}} retweeted 
+@{{$post.User.Screen_name}} ({{$post.Id_str}}) retweeted 
 {{end}}
 {{$user := $status.User.Screen_name}}
 
-@{{$user}}{{if $status.In_reply_to_status_id_str}} in reply to {{$status.In_reply_to_status_id_str}}{{end}}: <br><br>{{$status.Text}}
+@{{$user}} ({{$status.Id_str}}){{if $status.In_reply_to_status_id_str}} in reply to {{$status.In_reply_to_screen_name}} ({{$status.In_reply_to_status_id_str}}){{end}}: <br><br>{{$status.Text}}
 {{range $idxMedia, $media := $status.Extended_entities.Media}}
 <br><a href="https://twitter.com/{{$user}}/status/{{$status.Id_str}}"><img src="{{$media.Media_url}}"></a>
 {{end}}
@@ -24,7 +24,7 @@
 {{if $status.Quoted_status}}
 {{$quotedUser := $status.Quoted_status.User.Screen_name}}
 <br><br>Quotes
-@{{$quotedUser}}: <br><br>{{$status.Quoted_status.Text}}
+@{{$quotedUser}} ({{$status.Quoted_status.Id_str}}): <br><br>{{$status.Quoted_status.Text}}
 {{range $idxMedia, $media := $status.Quoted_status.Extended_entities.Media}}
 <br><a href="https://twitter.com/{{$quotedUser}}/status/{{$status.Quoted_status.Id_str}}"><img src="{{$media.Media_url}}"></a>
 {{end}}