diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index a219d21c..cbaf9d36 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -2,4 +2,18 @@
     margin-top: 2rem;
     height: 600px;
     background-color:#f9f9f9
-}
\ No newline at end of file
+}
+
+#thank-you-container {
+  display: none;
+  margin-top: 20px;
+  padding: 5px;
+  border: solid lightgrey 1px;
+  background-color: rgba(20, 180, 20, 0.2);
+  border-radius: 4px;
+}
+
+#thank-you-note {
+  width: 100%;
+  height: 200px;
+}
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 7c1a84b0..42e9a05e 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -22,7 +22,18 @@
   </h5>
 
   <% if (policy(@request_for_comment).mark_as_solved? and not @request_for_comment.solved?)  %>
-      <button class="btn btn-primary" id="mark-as-solved-button"><%= t('request_for_comments.mark_as_solved') %></button>
+      <button class="btn btn-primary" id="mark-as-solved-button">
+        <%= t('request_for_comments.mark_as_solved') %>
+      </button>
+      <div id="thank-you-container">
+        <p>
+          <%= t('request_for_comments.write_a_thank_you_node') %>
+        </p>
+        <textarea id="thank-you-note"></textarea>
+        <button class="btn btn-default" id="send-thank-you-note">
+          <%= t('request_for_comments.send_thank_you_note') %>
+        </button>
+      </div>
   <% elsif  (@request_for_comment.solved?) %>
       <button type="button" class="btn btn-success"><%= t('request_for_comments.solved') %></button>
   <% else %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a5bcf381..1546506c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -428,6 +428,8 @@ de:
     show_unsolved: "Nur ungelöste Anfragen anzeigen"
     solved: "Diese Frage wurde erfolgreich beantwortet"
     comment_exercise: "Ich möchte die Aufgabenstellung kommentieren"
+    write_a_thank_you_node: "Wenn Sie möchten, können Sie sich bei allen Kommentierenden bedanken:"
+    send_thank_you_note: "Senden"
   sessions:
     create:
       failure: Fehlerhafte E-Mail oder Passwort.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e5077e4e..1e6c9684 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -449,6 +449,8 @@ en:
     show_unsolved: "Unvsolved requests"
     solved: "This question has been answered"
     comment_exercise: "I would like to give feedback for this exercise"
+    write_a_thank_you_node: "If you want, you can write a thank you note to all commentors:"
+    send_thank_you_note: "Send"
   sessions:
     create:
       failure: Invalid email or password.