diff --git a/feedback/locale/fi/LC_MESSAGES/django.po b/feedback/locale/fi/LC_MESSAGES/django.po
index 00fa4b7..3652ba9 100644
--- a/feedback/locale/fi/LC_MESSAGES/django.po
+++ b/feedback/locale/fi/LC_MESSAGES/django.po
@@ -842,6 +842,10 @@ msgstr "näytä lisää"
 msgid "This feedback has unsaved changes!"
 msgstr "Palautteessa on tallentamattomia muutoksia!"
 
+#: feedback/templates_j2/feedback/_form.html
+msgid "Feedback received."
+msgstr "Palaute vastaanotettu."
+
 #: feedback/templates_j2/feedback/_form.html
 msgid "Submit"
 msgstr "Lähetä"
diff --git a/feedback/templates_j2/feedback/_form.html b/feedback/templates_j2/feedback/_form.html
index 41b733d..130d794 100644
--- a/feedback/templates_j2/feedback/_form.html
+++ b/feedback/templates_j2/feedback/_form.html
@@ -164,17 +164,19 @@
 			{{ _("This feedback has unsaved changes!") }}
 		</div>
 
-		<div>
-			<div class="btn-toolbar gap-2">
-				<input
-					type="submit"
-					value="{{ _('Submit') }}"
-					class="btn btn-primary aplus-submit mr-2">
-				<input
-					type="reset"
-					value="{{ _('Reset changes') }}"
-					class="btn btn-danger only-when-edited">
-			</div>
+		<div id="feedback-received-message" class="alert alert-info" style="display: none">
+			{{ _("Feedback received.") }}
+		</div>
+
+		<div class="btn-toolbar gap-2">
+			<input
+				type="submit"
+				value="{{ _('Submit') }}"
+				class="btn btn-primary aplus-submit mr-2">
+			<input
+				type="reset"
+				value="{{ _('Reset changes') }}"
+				class="btn btn-danger only-when-edited">
 		</div>
 	</form>
 
@@ -182,11 +184,19 @@
 	<script>
 		(function($) {
 			const f = $('#{{ form_id }}');
+			// implement feedback received notification
+			// needs to be only shown when feedback has just been sent by student
+			const feedbackJustReceived = f.closest('.exercise-response').data('aplus-grader-feedback-just-received');
+			if (feedbackJustReceived) {
+				$('#feedback-received-message').show();
+			}
 			// implement show more
 			const c = f.find('.history-well'), m = c.find('.show-more');
 			m.click(function() { c.find('li.initially-hidden').removeClass('initially-hidden').show(); m.hide(); });
 			// empty textfields
-			c.next('textarea, input[type="text"]').val("");
+			window.setTimeout(function() {
+				c.next('textarea, input[type="text"]').val("");
+			})
 			// implement edited notification
 			const o = f.find('.only-when-edited'), i = f.serialize();
 			let s = false;