diff --git a/lib/Constants.php b/lib/Constants.php
index 60af263ff..a2263c0d6 100644
--- a/lib/Constants.php
+++ b/lib/Constants.php
@@ -46,6 +46,7 @@ class Constants {
 	public const MAX_STRING_LENGTHS = [
 		'formTitle' => 256,
 		'formDescription' => 8192,
+		'submissionMessage' => 2048,
 		'questionText' => 2048,
 		'questionDescription' => 4096,
 		'optionText' => 1024,
diff --git a/lib/Db/Form.php b/lib/Db/Form.php
index 3f0b7d0af..e4021f534 100644
--- a/lib/Db/Form.php
+++ b/lib/Db/Form.php
@@ -52,6 +52,8 @@
  * @method void setShowExpiration(bool $value)
  * @method integer getLastUpdated()
  * @method void setLastUpdated(integer $value)
+ * @method string getSubmissionMessage()
+ * @method void setSubmissionMessage(string $value)
  */
 class Form extends Entity {
 	protected $hash;
@@ -64,6 +66,7 @@ class Form extends Entity {
 	protected $isAnonymous;
 	protected $submitMultiple;
 	protected $showExpiration;
+	protected $submissionMessage;
 	protected $lastUpdated;
 
 	/**
@@ -102,7 +105,8 @@ public function read() {
 			'isAnonymous' => (bool)$this->getIsAnonymous(),
 			'submitMultiple' => (bool)$this->getSubmitMultiple(),
 			'showExpiration' => (bool)$this->getShowExpiration(),
-			'lastUpdated' => (int)$this->getLastUpdated()
+			'lastUpdated' => (int)$this->getLastUpdated(),
+			'submissionMessage' => $this->getSubmissionMessage() ?? '',
 		];
 	}
 }
diff --git a/lib/Migration/Version030400Date20230628011500.php b/lib/Migration/Version030400Date20230628011500.php
new file mode 100644
index 000000000..6b3846ee6
--- /dev/null
+++ b/lib/Migration/Version030400Date20230628011500.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2023 Ferdinand Thiessen <rpm@fthiessen.de>
+ *
+ * @author Ferdinand Thiessen <rpm@fthiessen.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Forms\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version030400Date20230628011500 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+		$table = $schema->getTable('forms_v2_forms');
+
+		if (!$table->hasColumn('submission_message')) {
+			$table->addColumn('submission_message', Types::STRING, [
+				'notnull' => false,
+				'default' => '',
+				'length' => 2048,
+				'comment' => 'custom thank you message',
+			]);
+
+			return $schema;
+		}
+
+		return null;
+	}
+}
diff --git a/src/components/SidebarTabs/SettingsSidebarTab.vue b/src/components/SidebarTabs/SettingsSidebarTab.vue
index 7f3d11475..31a24a9b3 100644
--- a/src/components/SidebarTabs/SettingsSidebarTab.vue
+++ b/src/components/SidebarTabs/SettingsSidebarTab.vue
@@ -59,6 +59,23 @@
 				{{ t('forms', 'Show expiration date on form') }}
 			</NcCheckboxRadioSwitch>
 		</div>
+		<div class="submission-message">
+			<label class="submission-message__label"
+				:tabindex="editMessage ? null : '0'"
+				@focus="editMessage = true">
+				{{ t('forms', 'Custom submission message') }}
+				<textarea v-if="editMessage || !form.submissionMessage"
+					v-click-outside="() => { editMessage = false }"
+					:value="form.submissionMessage"
+					:maxlength="maxStringLengths.submissionMessage"
+					:placeholder="t('forms', 'Message to show after an user submitted the form (formatting using Markdown is supported)')"
+					class="submission-message__input"
+					@blur="editMessage = false"
+					@change="onSubmissionMessageChange" />
+				<!-- eslint-disable-next-line vue/no-v-html -->
+				<div v-else class="submission-message__output" v-html="submissionMessageHTML" />
+			</label>
+		</div>
 	</div>
 </template>
 
@@ -68,14 +85,23 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadi
 import NcDatetimePicker from '@nextcloud/vue/dist/Components/NcDatetimePicker.js'
 import ShareTypes from '../../mixins/ShareTypes.js'
 
+import { directive as ClickOutside } from 'v-click-outside'
+import { loadState } from '@nextcloud/initial-state'
+
 export default {
 	components: {
 		NcCheckboxRadioSwitch,
 		NcDatetimePicker,
 	},
 
+	directives: {
+		ClickOutside,
+	},
+
 	mixins: [ShareTypes],
 
+	inject: ['$markdownit'],
+
 	props: {
 		form: {
 			type: Object,
@@ -89,6 +115,9 @@ export default {
 				stringify: this.stringifyDate,
 				parse: this.parseTimestampToDate,
 			},
+			maxStringLengths: loadState('forms', 'maxStringLengths'),
+			/** If custom submission message is shown as input or rendered markdown */
+			editMessage: false,
 		}
 	},
 
@@ -125,6 +154,12 @@ export default {
 		expirationDate() {
 			return moment(this.form.expires, 'X').toDate()
 		},
+		/**
+		 * The submission message rendered as HTML
+		 */
+		submissionMessageHTML() {
+			return this.$markdownit.render(this.form.submissionMessage || '')
+		},
 	},
 
 	methods: {
@@ -159,6 +194,10 @@ export default {
 			this.$emit('update:formProp', 'expires', parseInt(moment(datetime).format('X')))
 		},
 
+		onSubmissionMessageChange({ target }) {
+			this.$emit('update:formProp', 'submissionMessage', target.value)
+		},
+
 		/**
 		 * Datepicker timestamp to string
 		 *
@@ -215,4 +254,29 @@ export default {
 .settings-div--indent {
 	margin-left: 40px;
 }
+
+.submission-message {
+	display: flex;
+	flex-direction: column;
+	margin-block-start: 12px;
+
+	&__input, &__output {
+		width: 100%;
+		min-height: 70px;
+	}
+	&__output {
+		@import '../../scssmixins/markdownOutput';
+
+		padding: 12px;
+		margin-block: 3px;
+		border: 2px solid var(--color-border-maxcontrast);
+		border-radius: var(--border-radius-large);
+
+		&:hover {
+			border-color: var(--color-primary-element);
+		}
+
+		@include markdown-output;
+	}
+}
 </style>
diff --git a/src/scssmixins/markdownOutput.scss b/src/scssmixins/markdownOutput.scss
index 13755bed4..ad31a5791 100644
--- a/src/scssmixins/markdownOutput.scss
+++ b/src/scssmixins/markdownOutput.scss
@@ -23,11 +23,16 @@
 @mixin markdown-output {
 	overflow-wrap: break-word;
 
-	::v-deep {
+	:deep() {
 		>:not(:first-child) {
 			margin-top: 1.5em;
 		}
 
+		a {
+			color: var(--color-primary-element);
+			text-decoration: underline;
+		}
+
 		blockquote {
 			padding-left: 1em;
 			border-left: 4px solid var(--color-primary-element);
diff --git a/src/views/Submit.vue b/src/views/Submit.vue
index 41c467d66..02c7f4ef4 100644
--- a/src/views/Submit.vue
+++ b/src/views/Submit.vue
@@ -60,10 +60,15 @@
 			</template>
 		</NcEmptyContent>
 		<NcEmptyContent v-else-if="success || !form.canSubmit"
-			:title="t('forms', 'Thank you for completing the form!')">
+			:title="t('forms', 'Thank you for completing the form!')"
+			:description="form.submissionMessage">
 			<template #icon>
 				<IconCheck :size="64" />
 			</template>
+			<template v-if="form.submissionMessage" #description>
+				<!-- eslint-disable-next-line vue/no-v-html -->
+				<p class="submission-message" v-html="submissionMessageHTML" />
+			</template>
 		</NcEmptyContent>
 		<NcEmptyContent v-else-if="isExpired"
 			:title="t('forms', 'Form expired')"
@@ -205,6 +210,16 @@ export default {
 			return message
 		},
 
+		/**
+		 * Rendered HTML of the custom submission message
+		 */
+		submissionMessageHTML() {
+			if (this.form.submissionMessage && (this.success || !this.form.canSubmit)) {
+				return this.markdownit.render(this.form.submissionMessage)
+			}
+			return ''
+		},
+
 		expirationMessage() {
 			const relativeDate = moment(this.form.expires, 'X').fromNow()
 			if (this.isExpired) {
@@ -359,6 +374,10 @@ export default {
 		}
 	}
 
+	.submission-message {
+		@include markdown-output;
+	}
+
 	form {
 		.question {
 			// Less padding needed as submit view does not have drag handles
diff --git a/tests/Integration/Api/ApiV2Test.php b/tests/Integration/Api/ApiV2Test.php
index ba38e6a2c..de5dc2db4 100644
--- a/tests/Integration/Api/ApiV2Test.php
+++ b/tests/Integration/Api/ApiV2Test.php
@@ -64,6 +64,7 @@ private function setTestForms() {
 				'submit_multiple' => false,
 				'show_expiration' => false,
 				'last_updated' => 123456789,
+				'submission_message' => 'Back to website',
 				'questions' => [
 					[
 						'type' => 'short',
@@ -166,6 +167,7 @@ private function setTestForms() {
 				'submit_multiple' => false,
 				'show_expiration' => false,
 				'last_updated' => 123456789,
+				'submission_message' => '',
 				'questions' => [
 					[
 						'type' => 'short',
@@ -214,6 +216,7 @@ public function setUp(): void {
 					'submit_multiple' => $qb->createNamedParameter($form['submit_multiple'], IQueryBuilder::PARAM_BOOL),
 					'show_expiration' => $qb->createNamedParameter($form['show_expiration'], IQueryBuilder::PARAM_BOOL),
 					'last_updated' => $qb->createNamedParameter($form['last_updated'], IQueryBuilder::PARAM_INT),
+					'submission_message' => $qb->createNamedParameter($form['submission_message'], IQueryBuilder::PARAM_STR),
 				]);
 			$qb->execute();
 			$formId = $qb->getLastInsertId();
@@ -471,6 +474,7 @@ public function dataGetNewForm() {
 					'questions' => [],
 					'shares' => [],
 					'submissionCount' => 0,
+					'submissionMessage' => ''
 				]
 			]
 		];
@@ -523,6 +527,7 @@ public function dataGetFullForm() {
 					'lastUpdated' => 123456789,
 					'canSubmit' => true,
 					'permissions' => Constants::PERMISSION_ALL,
+					'submissionMessage' => 'Back to website',
 					'questions' => [
 						[
 							'type' => 'short',
diff --git a/tests/Unit/Controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
index 01fd9c00b..de2eba8e2 100644
--- a/tests/Unit/Controller/ApiControllerTest.php
+++ b/tests/Unit/Controller/ApiControllerTest.php
@@ -359,7 +359,8 @@ public function dataTestCreateNewForm() {
 				'isAnonymous' => false,
 				'submitMultiple' => false,
 				'showExpiration' => false,
-				'lastUpdated' => 123456789
+				'lastUpdated' => 123456789,
+				'submissionMessage' => '',
 			]]
 		];
 	}
diff --git a/tests/Unit/FormsMigratorTest.php b/tests/Unit/FormsMigratorTest.php
index 321d3dbd1..2df4991b1 100644
--- a/tests/Unit/FormsMigratorTest.php
+++ b/tests/Unit/FormsMigratorTest.php
@@ -114,7 +114,7 @@ public function setUp(): void {
 	public function dataExport() {
 		return [
 			'exactlyOneOfEach' => [
-				'expectedJson' => '[{"title":"Link","description":"","created":1646251830,"access":{"permitAllUsers":false,"showToAllUsers":false},"expires":0,"isAnonymous":false,"submitMultiple":false,"showExpiration":false,"lastUpdated":123456789,"questions":[{"id":14,"order":2,"type":"multiple","isRequired":false,"text":"checkbox","description":"huhu","extraSettings":{},"options":[{"text":"ans1"}]}],"submissions":[{"userId":"anyUser@localhost","timestamp":1651354059,"answers":[{"questionId":14,"text":"ans1"}]}]}]'
+				'expectedJson' => '[{"title":"Link","description":"","created":1646251830,"access":{"permitAllUsers":false,"showToAllUsers":false},"expires":0,"isAnonymous":false,"submitMultiple":false,"showExpiration":false,"lastUpdated":123456789,"submissionMessage":"Back to website","questions":[{"id":14,"order":2,"type":"multiple","isRequired":false,"text":"checkbox","description":"huhu","extraSettings":{},"options":[{"text":"ans1"}]}],"submissions":[{"userId":"anyUser@localhost","timestamp":1651354059,"answers":[{"questionId":14,"text":"ans1"}]}]}]'
 			]
 		];
 	}
@@ -151,6 +151,7 @@ public function testExport(string $expectedJson) {
 		$form->setSubmitMultiple(false);
 		$form->setShowExpiration(false);
 		$form->setLastUpdated(123456789);
+		$form->setSubmissionMessage('Back to website');
 
 		$this->formsService->expects($this->once())
 			->method('getQuestions')
diff --git a/tests/Unit/Service/FormsServiceTest.php b/tests/Unit/Service/FormsServiceTest.php
index 62afa5943..dbc94e42f 100644
--- a/tests/Unit/Service/FormsServiceTest.php
+++ b/tests/Unit/Service/FormsServiceTest.php
@@ -207,6 +207,7 @@ public function dataGetForm() {
 						'displayName' => 'Some User'
 					]
 				],
+				'submissionMessage' => '',
 				'permissions' => Constants::PERMISSION_ALL
 			]]
 		];
@@ -427,7 +428,8 @@ public function dataGetPublicForm() {
 				'questions' => [],
 				'permissions' => [
 					'submit'
-				]
+				],
+				'submissionMessage' => '',
 			]]
 		];
 	}