diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index 15d639bb..e685805f 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -13,6 +13,18 @@ class RequestForComment < ActiveRecord::Base
         self.requested_at = Time.now
     end
 
+  def submission
+    Submission.find(file.context_id)
+  end
+
+  def last_submission
+    Submission.find_by_sql(" select * from submissions
+            where exercise_id = #{exercise_id} AND
+            user_id =  #{user_id}
+            order by created_at desc
+            limit 1").first
+  end
+
     private
     def self.row_number_user_sql
       select("id, user_id, exercise_id, file_id, requested_at, created_at, updated_at, user_type, row_number() OVER (PARTITION BY user_id ORDER BY created_at DESC) as row_number").to_sql
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index c27e5478..7946984b 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -1,20 +1,7 @@
 <div class="list-group">
   <h4 class="list-group-item-heading"><%= Exercise.find(@request_for_comment.exercise_id) %></h4>
   <p class="list-group-item-text">
-      <%
-
-           user = @request_for_comment.user
-           submission_id =  self.class.connection.execute("select id from submissions
-           where exercise_id =
-           #{@request_for_comment.exercise_id} AND
-           user_id =  #{@request_for_comment.user_id} AND
-           #{@request_for_comment.user_id} > created_at
-           order by created_at desc
-           limit 1").first['id'].to_i
-           submission = Submission.find(submission_id)
-
-      %>
-    <%= user %> | <%= @request_for_comment.requested_at %>
+    <%= @request_for_comment.user %> | <%= @request_for_comment.requested_at %> | <%= @request_for_comment.submission.id %>
   </p>
 </div>