diff --git a/app/assets/stylesheets/exercises.css.scss b/app/assets/stylesheets/exercises.css.scss
index e46d59af..1b3aca62 100644
--- a/app/assets/stylesheets/exercises.css.scss
+++ b/app/assets/stylesheets/exercises.css.scss
@@ -95,6 +95,17 @@ a.file-heading {
   left: 0;
 }
 
+.feedback-header {
+  display: flex;
+
+  .username {
+    flex-grow: 1;
+    font-weight: bold;
+  }
+
+  .date {}
+}
+
 .feedback {
   .text {
     margin-bottom: 10px;
diff --git a/app/views/exercises/feedback.html.slim b/app/views/exercises/feedback.html.slim
index 07b88167..7fcadc02 100644
--- a/app/views/exercises/feedback.html.slim
+++ b/app/views/exercises/feedback.html.slim
@@ -1,11 +1,12 @@
 h1 = @exercise
 
-ul.list-unstyled.panel-group#files
+ul.list-unstyled.panel-group
   - @feedbacks.each do |feedback|
     li.panel.panel-default
       .panel-heading role="tab" id="heading"
-        div.clearfix
-          span = feedback.user.name
+        div.clearfix.feedback-header
+          span.username = feedback.user.name
+          span.date = feedback.created_at
       .panel-collapse role="tabpanel"
         .panel-body.feedback
           .text = feedback.feedback_text