diff --git a/docs/t35t.md b/docs/t35t.md
index de01d41cbabc46d0536f42a03ef537469df15247..30010a86d503768b57c0c77a7eefa9ffa7ee5d2c 100644
--- a/docs/t35t.md
+++ b/docs/t35t.md
@@ -12,11 +12,15 @@ Alternativ kannst Du uns auch eine E-Mail an [makerspace@rub.de](mailto:makerspa
 													TemplateMissing='', 
 													Exclude=realname;honigtopf;schicken;FromAddr"/> 
 	-->
-	<input type="hidden" name="mail_options" value="charset=UTF-8,Exclude=realname;honigtopf;schicken;FromAddr"/>
+	<input type="hidden" name="mail_options" value="charset=UTF-8,Include=formatted_message,Exclude=vorname;nachname;email;tel;nachricht;data-privacy;realname;honigtopf;schicken;FromAddr"/>
+
 	<input type="hidden" name="good_url"      value="https://makerspace.ruhr-uni-bochum.de/danke/"  />
 	
 	<!-- required am Ende der Felddefinition bedeutet: Eingabe ist erforderlich> -->
 	<h2>Kontaktformular</h2>
+
+	<input type="hidden" name="formatted_message" id="formatted_message" />
+
     <div class="form-field">
 		<label for="nachname"><strong>Name:</strong></label>
 		<input name="nachname" type="text" maxlength="30" required/>
@@ -63,4 +67,18 @@ Alternativ kannst Du uns auch eine E-Mail an [makerspace@rub.de](mailto:makerspa
 	<div class="form-field">
 		<input type="submit" class="hover" value="Kontaktformular absenden" name="schicken" /> 
 	</div>							
-</form>
\ No newline at end of file
+</form>
+
+<script>
+document.querySelector('form').addEventListener('submit', function(e) {
+    var formattedMessage = 
+        "Vorname: " + document.querySelector('input[name="vorname"]').value + "\n" +
+        "Nachname: " + document.querySelector('input[name="nachname"]').value + "\n" +
+        "E-Mail: " + document.querySelector('input[name="email"]').value + "\n" +
+        "Telefonnummer: " + document.querySelector('input[name="tel"]').value + "\n" +
+        "Nachricht:\n" + document.querySelector('textarea[name="nachricht"]').value + "\n" +
+        "Einverständnis Datenschutz: " + (document.querySelector('input[name="data-privacy"]').checked ? 'Ja' : 'Nein');
+    
+    document.getElementById('formatted_message').value = formattedMessage;
+});
+</script>
\ No newline at end of file
diff --git a/public/t35t/index.html b/public/t35t/index.html
index ce5eecee2d0199367259507a36a7eeb4aecf792e..f7fcacd0432e7e294fa751cf67765bd7b87f0b23 100644
--- a/public/t35t/index.html
+++ b/public/t35t/index.html
@@ -656,11 +656,15 @@ Alternativ kannst Du uns auch eine E-Mail an <a href="mailto:makerspace@rub.de">
                                                     TemplateMissing='', 
                                                     Exclude=realname;honigtopf;schicken;FromAddr"/> 
     -->
-    <input type="hidden" name="mail_options" value="charset=UTF-8,Exclude=realname;honigtopf;schicken;FromAddr">
+    <input type="hidden" name="mail_options" value="charset=UTF-8,Include=formatted_message,Exclude=vorname;nachname;email;tel;nachricht;data-privacy;realname;honigtopf;schicken;FromAddr">
+
     <input type="hidden" name="good_url" value="https://makerspace.ruhr-uni-bochum.de/danke/">
 
     <!-- required am Ende der Felddefinition bedeutet: Eingabe ist erforderlich> -->
     <h2>Kontaktformular</h2>
+
+    <input type="hidden" name="formatted_message" id="formatted_message">
+
     <div class="form-field">
         <label for="nachname"><strong>Name:</strong></label>
         <input name="nachname" type="text" maxlength="30" required>
@@ -707,7 +711,21 @@ Alternativ kannst Du uns auch eine E-Mail an <a href="mailto:makerspace@rub.de">
     <div class="form-field">
         <input type="submit" class="hover" value="Kontaktformular absenden" name="schicken"> 
     </div>                          
-</form></div>
+</form>
+
+<script>
+document.querySelector('form').addEventListener('submit', function(e) {
+    var formattedMessage = 
+        "Vorname: " + document.querySelector('input[name="vorname"]').value + "\n" +
+        "Nachname: " + document.querySelector('input[name="nachname"]').value + "\n" +
+        "E-Mail: " + document.querySelector('input[name="email"]').value + "\n" +
+        "Telefonnummer: " + document.querySelector('input[name="tel"]').value + "\n" +
+        "Nachricht:\n" + document.querySelector('textarea[name="nachricht"]').value + "\n" +
+        "Einverständnis Datenschutz: " + (document.querySelector('input[name="data-privacy"]').checked ? 'Ja' : 'Nein');
+
+    document.getElementById('formatted_message').value = formattedMessage;
+});
+</script></div>