diff --git a/locale/en/LC_MESSAGES/vips.mo b/locale/en/LC_MESSAGES/vips.mo
index 9a062003caa15e75222fb406758183dcc4622c61..a1206c83922b8cce662b0aa9f236c8b9dbc3ae46 100644
Binary files a/locale/en/LC_MESSAGES/vips.mo and b/locale/en/LC_MESSAGES/vips.mo differ
diff --git a/locale/en/LC_MESSAGES/vips.po b/locale/en/LC_MESSAGES/vips.po
index 33d4aedaa79031ce43d6b2f1f9ea231b60c3975b..5a8006aee7df1239d630efe68ad41e70c0de3240 100644
--- a/locale/en/LC_MESSAGES/vips.po
+++ b/locale/en/LC_MESSAGES/vips.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-06 17:30+0200\n"
+"POT-Creation-Date: 2022-10-17 06:53+0200\n"
 "PO-Revision-Date: 2011-12-07 13:49+0200\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -34,8 +34,8 @@ msgstr "Summary of all your tasks in Vips"
 msgid "Aufgabenblätter"
 msgstr "Worksheets"
 
-#: VipsPlugin.php:119 exercises/tb_exercise.php:205
-#: exercises/tb_exercise.php:236
+#: VipsPlugin.php:119 controllers/solutions.php:1025
+#: exercises/tb_exercise.php:205 exercises/tb_exercise.php:236
 msgid "Sie haben keinen Zugriff auf diese Datei!"
 msgstr "You don't have access to this file!"
 
@@ -65,8 +65,8 @@ msgstr[0] "%d new worksheet"
 msgstr[1] "%d new worksheets"
 
 #: VipsPlugin.php:280 controllers/solutions.php:50
-#: controllers/solutions.php:122 controllers/solutions.php:1372
-#: controllers/solutions.php:1531
+#: controllers/solutions.php:122 controllers/solutions.php:1441
+#: controllers/solutions.php:1600
 msgid "Ergebnisse"
 msgstr "Results"
 
@@ -313,12 +313,12 @@ msgstr[0] "One group has been created."
 msgstr[1] "%d groups have been created."
 
 #: controllers/groups.php:456 controllers/solutions.php:672
-#: controllers/solutions.php:1288
+#: controllers/solutions.php:1357
 msgid "Nachname"
 msgstr "Family name"
 
 #: controllers/groups.php:456 controllers/solutions.php:672
-#: controllers/solutions.php:1288
+#: controllers/solutions.php:1357
 msgid "Vorname"
 msgstr "First name"
 
@@ -328,6 +328,8 @@ msgstr "Group"
 
 #: controllers/groups.php:456 views/pool/list_assignments.php:37
 #: views/pool/list_exercises.php:43 views/sheets/edit_exercise.php:73
+#: views/solutions/edit_solution.php:123
+#: views/solutions/feedback_files_table.php:19
 #: views/exercises/tb_exercise/correct.php:128
 #: views/exercises/tb_exercise/solve.php:79
 msgid "Datum"
@@ -557,7 +559,7 @@ msgstr "Worksheet"
 
 #: controllers/sheets.php:580 controllers/sheets.php:612
 #: controllers/sheets.php:1680 controllers/solutions.php:351
-#: controllers/solutions.php:895 controllers/solutions.php:1253
+#: controllers/solutions.php:895 controllers/solutions.php:1322
 #: views/pool/list_assignments.php:100
 #: views/sheets/list_assignments_list.php:132
 #: views/sheets/list_assignments_stud.php:97
@@ -641,7 +643,7 @@ msgid_plural "Die Aufgabenblätter wurden verschoben."
 msgstr[0] "The worksheet has been moved."
 msgstr[1] "The worksheets have been moved."
 
-#: controllers/sheets.php:961 controllers/solutions.php:1214
+#: controllers/sheets.php:961 controllers/solutions.php:1283
 msgid ""
 "Die Klausur wurde zurückgesetzt und alle abgegebenen Lösungen archiviert."
 msgstr "The exam has been reset and all existing solutions have been archived."
@@ -668,12 +670,14 @@ msgstr "Create a new task"
 msgid "Aufgabe %d"
 msgstr "Task %d"
 
-#: controllers/sheets.php:1197 exercises/tb_exercise.php:166
+#: controllers/sheets.php:1197 controllers/solutions.php:1191
+#: exercises/tb_exercise.php:166
 #, php-format
 msgid "Fehler beim Hochladen der Datei \"%s\"."
 msgstr "Upload error for file \"%s\"."
 
-#: controllers/sheets.php:1199 exercises/tb_exercise.php:170
+#: controllers/sheets.php:1199 controllers/solutions.php:1193
+#: exercises/tb_exercise.php:170
 #, php-format
 msgid "Die hochgeladene Datei \"%s\" ist zu groß."
 msgstr "The uploaded file \"%s\" is too big."
@@ -741,7 +745,7 @@ msgstr[0] "Worksheet %s was added with %d task."
 msgstr[1] "Worksheet %s was added with %d tasks."
 
 #: controllers/sheets.php:1843 controllers/sheets.php:1850
-#: controllers/solutions.php:1243
+#: controllers/solutions.php:1312
 msgid "Die Korrekturen wurden noch nicht freigegeben."
 msgstr "No task was graded or the grades have not been published."
 
@@ -826,18 +830,18 @@ msgstr "This page lists the correction status of all your worksheets."
 msgid "Notenverteilung festlegen"
 msgstr "Grade distribution"
 
-#: controllers/solutions.php:123 controllers/solutions.php:1373
-#: controllers/solutions.php:1532 views/solutions/participants_overview.php:6
+#: controllers/solutions.php:123 controllers/solutions.php:1442
+#: controllers/solutions.php:1601 views/solutions/participants_overview.php:6
 msgid "Punkteübersicht"
 msgstr "Point overview"
 
-#: controllers/solutions.php:124 controllers/solutions.php:1374
-#: controllers/solutions.php:1533 views/solutions/participants_overview.php:28
+#: controllers/solutions.php:124 controllers/solutions.php:1443
+#: controllers/solutions.php:1602 views/solutions/participants_overview.php:28
 msgid "Notenübersicht"
 msgstr "Grade overview"
 
-#: controllers/solutions.php:125 controllers/solutions.php:1375
-#: controllers/solutions.php:1534
+#: controllers/solutions.php:125 controllers/solutions.php:1444
+#: controllers/solutions.php:1603
 msgid "Statistik"
 msgstr "Statistics"
 
@@ -856,8 +860,8 @@ msgstr "The visibility settings have been saved."
 msgid "Teilnehmer"
 msgstr "Participants"
 
-#: controllers/solutions.php:322 controllers/solutions.php:1296
-#: views/solutions/participants_overview.php:109
+#: controllers/solutions.php:322 controllers/solutions.php:1365
+#: views/solutions/participants_overview.php:107
 msgid "Summe"
 msgstr "Total"
 
@@ -1057,81 +1061,81 @@ msgstr "Version %s from %s"
 msgid "Die Korrekturen des Aufgabenblatts sind nicht freigegeben."
 msgstr "No task was graded or the grades have not been published."
 
-#: controllers/solutions.php:1027
+#: controllers/solutions.php:1060
 msgid "Die ausgewählte Lösung wurde als aktuelle Version gespeichert."
 msgstr "The selected solution was saved as the current version."
 
-#: controllers/solutions.php:1121
+#: controllers/solutions.php:1155
 #, php-format
 msgid "Sie haben Bonuspunkte vergeben (%s von %s)."
 msgstr "You assigned %d bonus points."
 
-#: controllers/solutions.php:1123
+#: controllers/solutions.php:1157
 #, php-format
 msgid "Sie haben eine negative Punktzahl eingegeben (%s von %s)."
 msgstr "You entered a negative amount of points (%s of %s)."
 
-#: controllers/solutions.php:1125
+#: controllers/solutions.php:1159
 #, php-format
 msgid "Die eingegebene Punktzahl wurde auf halbe Punkte gerundet (%s)."
 msgstr "The assigned points have been rounded to half points (%s)."
 
-#: controllers/solutions.php:1135
+#: controllers/solutions.php:1178
 msgid "Ihre Korrektur wurde gespeichert."
 msgstr "Your grade was saved."
 
-#: controllers/solutions.php:1187
+#: controllers/solutions.php:1256
 msgid "Der Abgabezeitpunkt liegt nach dem Ende der Klausur."
 msgstr "The specified due date is after the end time of the exam."
 
-#: controllers/solutions.php:1190
+#: controllers/solutions.php:1259
 msgid "Der Abgabezeitpunkt ist keine gültige Uhrzeit."
 msgstr "The specified due date is not a valid time."
 
-#: controllers/solutions.php:1217
+#: controllers/solutions.php:1286
 msgid ""
 "Die Teilnahme wurde zurückgesetzt und ggf. abgegebene Lösungen archiviert."
 msgstr ""
 "The exam has been reset for this user and any solutions have been archived."
 
-#: controllers/solutions.php:1249
+#: controllers/solutions.php:1318
 msgid ""
 "Sie können hier die Ergebnisse bzw. die Korrekturen ihrer Aufgaben ansehen."
 msgstr "This page lists all the results of the test."
 
-#: controllers/solutions.php:1288
+#: controllers/solutions.php:1357
 msgid "Matrikelnr."
 msgstr "Student registration number"
 
-#: controllers/solutions.php:1299 views/admin/edit_grades.php:13
-#: views/solutions/participants_overview.php:116
+#: controllers/solutions.php:1368 views/admin/edit_grades.php:13
+#: views/solutions/participants_overview.php:114
 #: views/solutions/student_grade.php:5
 msgid "Note"
 msgstr "Grade"
 
-#: controllers/solutions.php:1308 views/solutions/participants_overview.php:126
+#: controllers/solutions.php:1377 views/solutions/participants_overview.php:124
 msgid "Maximalpunktzahl:"
 msgstr "Maximum number of points:"
 
-#: controllers/solutions.php:1310 views/solutions/participants_overview.php:128
+#: controllers/solutions.php:1379 views/solutions/participants_overview.php:126
 msgid "Gewichtung:"
 msgstr "Weight:"
 
-#: controllers/solutions.php:1366
+#: controllers/solutions.php:1435
 msgid "Notenliste.csv"
 msgstr "grades.csv"
 
-#: controllers/solutions.php:1369
+#: controllers/solutions.php:1438
 msgid ""
 "Diese Seite gibt einen Überblick über die von allen Teilnehmern erreichten "
 "Punkte und ggf. Noten."
 msgstr "This page displays a summary of all test results for this course."
 
-#: controllers/solutions.php:1379 controllers/solutions.php:1538
+#: controllers/solutions.php:1448 controllers/solutions.php:1607
 msgid "Liste im CSV-Format exportieren"
 msgstr "Export this list in CSV format"
 
-#: controllers/solutions.php:1474 views/config/pending_assignments.php:12
+#: controllers/solutions.php:1543 views/config/pending_assignments.php:12
 #: views/pool/list_assignments.php:25 views/pool/list_exercises.php:25
 #: views/sheets/edit_assignment.php:16 views/sheets/edit_exercise.php:50
 #: views/sheets/list_assignments_list.php:37
@@ -1142,37 +1146,37 @@ msgstr "Export this list in CSV format"
 msgid "Titel"
 msgstr "Title"
 
-#: controllers/solutions.php:1475 exercises/Exercise.php:103
+#: controllers/solutions.php:1544 exercises/Exercise.php:103
 #: exercises/Exercise.php:591 exercises/Exercise.php:612
 msgid "Aufgabe"
 msgstr "Task"
 
-#: controllers/solutions.php:1476
+#: controllers/solutions.php:1545
 msgid "Item"
 msgstr "Item"
 
-#: controllers/solutions.php:1477 views/solutions/statistics.php:15
+#: controllers/solutions.php:1546 views/solutions/statistics.php:15
 msgid "erreichbare Punkte"
 msgstr "achievable points"
 
-#: controllers/solutions.php:1478 views/solutions/statistics.php:18
+#: controllers/solutions.php:1547 views/solutions/statistics.php:18
 msgid "durchschn. Punkte"
 msgstr "average points"
 
-#: controllers/solutions.php:1479 views/solutions/statistics.php:21
+#: controllers/solutions.php:1548 views/solutions/statistics.php:21
 msgid "korrekte Lösungen"
 msgstr "correct solutions"
 
-#: controllers/solutions.php:1511 views/solutions/statistics.php:68
+#: controllers/solutions.php:1580 views/solutions/statistics.php:68
 #, php-format
 msgid "Item %d"
 msgstr "Item %d"
 
-#: controllers/solutions.php:1524
+#: controllers/solutions.php:1593
 msgid "Statistik.csv"
 msgstr "statistics.csv"
 
-#: controllers/solutions.php:1527
+#: controllers/solutions.php:1596
 msgid ""
 "Diese Seite gibt einen Überblick über die im Durchschnitt von allen "
 "Teilnehmern erreichten Punkte sowie den Prozentsatz der vollständig "
@@ -3157,7 +3161,7 @@ msgstr "all students (no limitation)"
 #: views/sheets/start_assignment_dialog.php:30
 #: views/solutions/assignments_list.php:163
 #: views/solutions/edit_assignment_attempt.php:23
-#: views/solutions/edit_solution.php:68 views/solutions/edit_solution.php:128
+#: views/solutions/edit_solution.php:68 views/solutions/edit_solution.php:193
 #: views/solutions/update_released_dialog.php:40
 msgid "Speichern"
 msgstr "Save"
@@ -3259,7 +3263,9 @@ msgid "Ende"
 msgstr "End"
 
 #: views/config/pending_assignments.php:24 views/pool/list_assignments.php:31
-#: views/pool/list_exercises.php:37 views/exercises/tb_exercise/correct.php:125
+#: views/pool/list_exercises.php:37 views/solutions/edit_solution.php:120
+#: views/solutions/feedback_files_table.php:16
+#: views/exercises/tb_exercise/correct.php:125
 #: views/exercises/tb_exercise/solve.php:76
 msgid "Autor"
 msgstr "Author"
@@ -3276,6 +3282,7 @@ msgstr "Choose the course for your exam:"
 
 #: views/exam_mode/index.php:10 views/sheets/print_assignment.php:30
 #: views/sheets/print_assignment.php:32
+#: views/solutions/feedback_files_table.php:10
 #: views/exercises/tb_exercise/correct.php:119
 #: views/exercises/tb_exercise/solve.php:70
 msgid "Name"
@@ -3318,12 +3325,12 @@ msgid "Bewertung"
 msgstr "Grading"
 
 #: views/exercises/courseware_block.php:42 views/sheets/show_exercise.php:50
-#: views/solutions/edit_solution.php:91 views/solutions/edit_solution.php:103
+#: views/solutions/edit_solution.php:91 views/solutions/edit_solution.php:105
 msgid "Anmerkungen zur Lösung"
 msgstr "Remarks on the solution"
 
 #: views/exercises/courseware_block.php:50 views/sheets/show_exercise.php:58
-#: views/solutions/view_solution.php:61
+#: views/solutions/view_solution.php:63
 #, php-format
 msgid "Erreichte Punkte: %s von %s"
 msgstr "Achieved points: %s of %s"
@@ -3354,15 +3361,15 @@ msgstr "Make input field larger"
 msgid "Eingabefeld verkleinern"
 msgstr "Make input field smaller"
 
-#: views/exercises/print_exercise.php:23
+#: views/exercises/print_exercise.php:24
 msgid "Bemerkungen zur Lösung:"
 msgstr "Remarks on the solution:"
 
-#: views/exercises/print_exercise.php:32
+#: views/exercises/print_exercise.php:33
 msgid "Anmerkung des Korrektors:"
 msgstr "Remark from corrector:"
 
-#: views/exercises/print_exercise.php:39 views/sheets/print_assignment.php:77
+#: views/exercises/print_exercise.php:44 views/sheets/print_assignment.php:77
 msgid "Erreichte Punkte:"
 msgstr "Achieved points:"
 
@@ -3447,6 +3454,7 @@ msgstr "Participants (max. %d)"
 #: views/sheets/list_assignments_list.php:63
 #: views/solutions/assignment_solutions.php:89
 #: views/solutions/assignments_list.php:45
+#: views/solutions/edit_solution.php:126
 #: views/exercises/tb_exercise/solve.php:82
 msgid "Aktionen"
 msgstr "Actions"
@@ -3880,19 +3888,22 @@ msgstr "Attached files"
 msgid "Vorschau"
 msgstr "Preview"
 
-#: views/sheets/edit_exercise.php:70
+#: views/sheets/edit_exercise.php:70 views/solutions/edit_solution.php:117
+#: views/solutions/feedback_files_table.php:13
 #: views/exercises/tb_exercise/correct.php:122
 #: views/exercises/tb_exercise/solve.php:73
 msgid "Größe"
 msgstr "Size"
 
-#: views/sheets/edit_exercise.php:87
+#: views/sheets/edit_exercise.php:87 views/solutions/edit_solution.php:137
+#: views/solutions/feedback_files_table.php:29
 #: views/exercises/tb_exercise/correct.php:138
 #: views/exercises/tb_exercise/solve.php:93
 msgid "Datei herunterladen"
 msgstr "Download file"
 
-#: views/sheets/edit_exercise.php:105 views/exercises/tb_exercise/solve.php:108
+#: views/sheets/edit_exercise.php:105 views/solutions/edit_solution.php:152
+#: views/exercises/tb_exercise/solve.php:108
 msgid "Datei löschen"
 msgstr "Delete file"
 
@@ -3900,16 +3911,19 @@ msgstr "Delete file"
 msgid "Dateien zur Aufgabe hochladen"
 msgstr "Upload file attachments"
 
-#: views/sheets/edit_exercise.php:116 views/exercises/tb_exercise/solve.php:119
+#: views/sheets/edit_exercise.php:116 views/solutions/edit_solution.php:163
+#: views/exercises/tb_exercise/solve.php:119
 #, php-format
 msgid "%d Dateien ausgewählt"
 msgstr "%d files selected"
 
-#: views/sheets/edit_exercise.php:117 views/exercises/tb_exercise/solve.php:120
+#: views/sheets/edit_exercise.php:117 views/solutions/edit_solution.php:164
+#: views/exercises/tb_exercise/solve.php:120
 msgid "Klicken Sie auf \"Speichern\", um die gewählten Dateien hochzuladen."
 msgstr "Click \"Save\" to upload the selected files."
 
-#: views/sheets/edit_exercise.php:118 views/exercises/tb_exercise/solve.php:62
+#: views/sheets/edit_exercise.php:118 views/solutions/edit_solution.php:165
+#: views/exercises/tb_exercise/solve.php:62
 #, php-format
 msgid "max. %s MB pro Datei"
 msgstr "max. %s MB per file"
@@ -4079,7 +4093,7 @@ msgid "Matrikelnummer"
 msgstr "Student registration number"
 
 #: views/sheets/print_assignment.php:69
-#: views/solutions/student_assignment_solutions.php:91
+#: views/solutions/student_assignment_solutions.php:92
 msgid "Gesamtpunktzahl"
 msgstr "Total points"
 
@@ -4439,33 +4453,46 @@ msgstr "graded automatically"
 msgid "unkorrigiert"
 msgstr "not graded"
 
-#: views/solutions/edit_solution.php:99
+#: views/solutions/edit_solution.php:101
 #, php-format
 msgid "Vergebene Punkte: %s von %s"
 msgstr "Points given: %s of %s"
 
-#: views/solutions/edit_solution.php:109
+#: views/solutions/edit_solution.php:114
+#: views/solutions/feedback_files_table.php:3
+msgid "Dateien zur Korrektur"
+msgstr "Attached files"
+
+#: views/solutions/edit_solution.php:163
+msgid "Dateien zur Korrektur hochladen"
+msgstr "Upload file attachments"
+
+#: views/solutions/edit_solution.php:174
 #: views/exercises/tb_exercise/correct.php:42
 msgid "Textvorschau"
 msgstr "Preview"
 
-#: views/solutions/edit_solution.php:117
+#: views/solutions/edit_solution.php:182
 #, php-format
 msgid "Vergebene Punkte (von %s)"
 msgstr "Points given (of %s)"
 
-#: views/solutions/edit_solution.php:118
+#: views/solutions/edit_solution.php:183
 msgid "Bitte geben Sie eine Zahl ein"
 msgstr "Please enter a number"
 
-#: views/solutions/edit_solution.php:126
+#: views/solutions/edit_solution.php:191
 msgid "Als aktuelle Lösung speichern"
 msgstr "Save as current solution"
 
-#: views/solutions/edit_solution.php:133
+#: views/solutions/edit_solution.php:198
 msgid "Lösung als korrigiert markieren"
 msgstr "Mark submission as graded"
 
+#: views/solutions/feedback_files.php:3
+msgid "Dateien zur Korrektur:"
+msgstr "Attached files:"
+
 #: views/solutions/gradebook_dialog.php:9
 msgid "Name im Gradebook"
 msgstr "Name of gradebook entry"
@@ -4491,22 +4518,22 @@ msgstr "Worksheets"
 msgid "Blöcke"
 msgstr "Blocks"
 
-#: views/solutions/participants_overview.php:172
+#: views/solutions/participants_overview.php:170
 #, php-format
 msgid "%s Punkte"
 msgstr "%s points"
 
-#: views/solutions/participants_overview.php:173
+#: views/solutions/participants_overview.php:171
 #, php-format
 msgid "%s Prozent"
 msgstr "%s percent"
 
-#: views/solutions/participants_overview.php:189
+#: views/solutions/participants_overview.php:187
 #, php-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: views/solutions/participants_overview.php:195
+#: views/solutions/participants_overview.php:193
 #, php-format
 msgid "absolut: %s %%"
 msgstr "absolute: %s %%"
@@ -4878,7 +4905,7 @@ msgstr "Add question"
 
 #: views/exercises/me_exercise/correct.php:17
 #: views/exercises/me_exercise/print.php:17
-#: views/exercises/tb_exercise/print.php:66
+#: views/exercises/tb_exercise/print.php:68
 msgid "Musterlösung:"
 msgstr "Sample solution:"