diff --git a/appinfo/info.xml b/appinfo/info.xml
index c2f293b713..467c947c98 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -55,6 +55,10 @@
 		<nextcloud min-version="28" max-version="29" />
 	</dependencies>
 
+	<background-jobs>
+		<job>OCA\Forms\BackgroundJob\CleanupUploadedFilesJob</job>
+	</background-jobs>
+
 	<settings>
 		<admin>OCA\Forms\Settings\Settings</admin>
 		<admin-section>OCA\Forms\Settings\SettingsSection</admin-section>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index bfb2e00947..0c1fea1a9e 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -331,6 +331,14 @@
 				'apiVersion' => 'v2(\.[1-4])?'
 			]
 		],
+		[
+			'name' => 'api#uploadFiles',
+			'url' => '/api/{apiVersion}/uploadFiles/{formId}/{questionId}',
+			'verb' => 'POST',
+			'requirements' => [
+				'apiVersion' => 'v2.5'
+			]
+		],
 		[
 			'name' => 'api#insertSubmission',
 			'url' => '/api/{apiVersion}/submission/insert',
diff --git a/docs/API.md b/docs/API.md
index 86f72b4306..fd095861e4 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -28,6 +28,8 @@ This file contains the API-Documentation. For more information on the returned D
 - Completely new way of handling access & shares.
 
 ### Other API changes
+- In API version 2.5 the following endpoints were introduced:
+  - `POST /api/2.5/uploadFiles/{formId}/{questionId}` to upload files to answer before form submitting
 - In API version 2.4 the following endpoints were introduced:
   - `POST /api/2.4/form/link/{fileFormat}` to link form to a file
   - `POST /api/2.4/form/unlink` to unlink form from a file
@@ -176,18 +178,20 @@ Returns the full-depth object of the requested form (without submissions).
           "text": "Option 2"
         }
       ],
+      "accept": [],
       "extraSettings": {}
     },
     {
       "id": 2,
       "formId": 3,
       "order": 2,
-      "type": "short",
+      "type": "file",
       "isRequired": true,
       "text": "Question 2",
       "name": "something_other",
       "options": [],
       "extraSettings": {}
+      "accept": ["image/*", ".pdf"],
     }
   ],
   "shares": [
@@ -629,6 +633,21 @@ Delete all Submissions to a form
 "data": 3
 ```
 
+### Upload a file
+Upload a files to answer before form submitting
+- Endpoint: `/api/2.5/uploadFiles/{formId}/{questionId}`
+- Method: `POST`
+- Parameters:
+  | Parameter    | Type           | Description |
+  |--------------|----------------|-------------|
+  | _formId_     | Integer        | ID of the form to upload the file to |
+  | _questionId_ | Integer        | ID of the question to upload the file to |
+  | _files_      | Array of files | Files to upload |
+- Response: **Status-Code OK**, as well as the id of the uploaded file and it's name.
+```
+"data": {"uploadedFileId": integer, "fileName": "string"}
+```
+
 ### Insert a Submission
 Store Submission to Database
 - Endpoint: `/api/v2.4/submission/insert`
@@ -644,10 +663,15 @@ Store Submission to Database
   - QuestionID as key
   - An **array** of values as value --> Even for short Text Answers, wrapped into Array.
   - For Question-Types with pre-defined answers (`multiple`, `multiple_unique`, `dropdown`), the array contains the corresponding option-IDs.
+  - For File-Uploads, the array contains the objects with key `uploadedFileId` (value from Upload a file endpoint).
   ```
   {
     "1":[27,32],              // dropdown or multiple
     "2":["ShortTextAnswer"],  // All Text-Based Question-Types
+    "3":[                     // File-Upload
+        {"uploadedFileId": integer},
+        {"uploadedFileId": integer}
+    ],
   }
   ```
 - Response: **Status-Code OK**.
diff --git a/docs/DataStructure.md b/docs/DataStructure.md
index 4c6f7345de..a5865bf42f 100644
--- a/docs/DataStructure.md
+++ b/docs/DataStructure.md
@@ -194,11 +194,15 @@ Currently supported Question-Types are:
 ## Extra Settings
 Optional extra settings for some [Question Types](#question-types)
 
-| Extra Setting      | Question Type | Type    | Values | Description |
-|--------------------|---------------|---------|--------|-------------|
-| `allowOtherAnswer` | `multiple, multiple_unique` | Boolean | `true/false` | Allows the user to specify a custom answer |
-| `shuffleOptions`   | `dropdown, multiple, multiple_unique` | Boolean | `true/false` | The list of options should be shuffled |
-| `optionsLimitMax`  | `multiple`    | Integer | -      | Maximum number of options that can be selected |
-| `optionsLimitMin`  | `multiple`    | Integer | -      | Minimum number of options that must be selected |
-| `validationType`   | `short` | string | `null, 'phone', 'email', 'regex', 'number'` | Custom validation for checking a submission |
-| `validationRegex`  | `short` | string | regular expression | if `validationType` is 'regex' this defines the regular expression to apply |
+| Extra Setting           | Question Type                         | Type             | Values                                      | Description                                                                 |
+|-------------------------|---------------------------------------|------------------|---------------------------------------------|-----------------------------------------------------------------------------|
+| `allowOtherAnswer`      | `multiple, multiple_unique`           | Boolean          | `true/false`                                | Allows the user to specify a custom answer                                  |
+| `shuffleOptions`        | `dropdown, multiple, multiple_unique` | Boolean          | `true/false`                                | The list of options should be shuffled                                      |
+| `optionsLimitMax`       | `multiple`                            | Integer          | -                                           | Maximum number of options that can be selected                              |
+| `optionsLimitMin`       | `multiple`                            | Integer          | -                                           | Minimum number of options that must be selected                             |
+| `validationType`        | `short`                               | string           | `null, 'phone', 'email', 'regex', 'number'` | Custom validation for checking a submission                                 |
+| `validationRegex`       | `short`                               | string           | regular expression                          | if `validationType` is 'regex' this defines the regular expression to apply |
+| `allowedFileTypes`      | `file`                                | Array of strings | `'image', 'x-office/document'`              | Allowed file types for file upload                                          |
+| `allowedFileExtensions` | `file`                                | Array of strings | `'jpg', 'png'`                              | Allowed file extensions for file upload                                     |
+| `maxAllowedFilesCount`  | `file`                                | Integer          | -                                           | Maximum number of files that can be uploaded, 0 means no limit              |
+| `maxFileSize`           | `file`                                | Integer          | -                                           | Maximum file size in bytes, 0 means no limit                                |
diff --git a/lib/BackgroundJob/CleanupUploadedFilesJob.php b/lib/BackgroundJob/CleanupUploadedFilesJob.php
new file mode 100644
index 0000000000..7bcb29712c
--- /dev/null
+++ b/lib/BackgroundJob/CleanupUploadedFilesJob.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * @copyright Copyright (c) 2024 Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @author Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * 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\BackgroundJob;
+
+use OCA\Forms\Constants;
+use OCA\Forms\Db\FormMapper;
+use OCA\Forms\Db\UploadedFileMapper;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
+use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
+use Psr\Log\LoggerInterface;
+
+class CleanupUploadedFilesJob extends TimedJob {
+	private const FILE_LIFETIME = '-1 hour';
+
+	public function __construct(
+		private IRootFolder $storage,
+		private FormMapper $formMapper,
+		private UploadedFileMapper $uploadedFileMapper,
+		private LoggerInterface $logger,
+		ITimeFactory $time) {
+		parent::__construct($time);
+
+		$this->setInterval(60 * 60);
+	}
+
+	/**
+	 * @param array $argument
+	 */
+	public function run($argument): void {
+		$dateTime = new \DateTimeImmutable(self::FILE_LIFETIME);
+
+		$this->logger->info('Deleting files that were uploaded before {before} and still not submitted.', [
+			'before' => $dateTime->format(\DateTimeImmutable::ATOM),
+		]);
+
+		$uploadedFiles = $this->uploadedFileMapper->findUploadedEarlierThan($dateTime);
+
+		$deleted = 0;
+		$usersToCleanup = [];
+		foreach ($uploadedFiles as $uploadedFile) {
+			$this->logger->info('Deleting uploaded file "{originalFileName}" for form {formId}.', [
+				'originalFileName' => $uploadedFile->getOriginalFileName(),
+				'formId' => $uploadedFile->getFormId(),
+			]);
+
+			$form = $this->formMapper->findById($uploadedFile->getFormId());
+			$usersToCleanup[$form->getOwnerId()] = true;
+			$userFolder = $this->storage->getUserFolder($form->getOwnerId());
+
+			$nodes = $userFolder->getById($uploadedFile->getFileId());
+
+			if (!empty($nodes)) {
+				$node = $nodes[0];
+				$node->delete();
+			} else {
+				$this->logger->warning('Could not find uploaded file "{fileId}" for deletion.', [
+					'fileId' => $uploadedFile->getFileId(),
+				]);
+			}
+
+			$this->uploadedFileMapper->delete($uploadedFile);
+
+			$deleted++;
+		}
+
+		$this->logger->info('Deleted {deleted} uploaded files.', ['deleted' => $deleted]);
+
+		// now delete empty folders in user folders
+		$deleted = 0;
+		foreach (array_keys($usersToCleanup) as $userId) {
+			$this->logger->info('Cleaning up empty folders for user {userId}.', ['userId' => $userId]);
+			$userFolder = $this->storage->getUserFolder($userId);
+
+			$unsubmittedFilesFolder = $userFolder->get(Constants::UNSUBMITTED_FILES_FOLDER);
+			if (!$unsubmittedFilesFolder instanceof Folder) {
+				continue;
+			}
+
+			foreach ($unsubmittedFilesFolder->getDirectoryListing() as $node) {
+				if ($node->getName() < $dateTime->getTimestamp()) {
+					$node->delete();
+					$deleted++;
+				}
+			}
+		}
+
+		$this->logger->info('Deleted {deleted} folders.', ['deleted' => $deleted]);
+	}
+}
diff --git a/lib/Constants.php b/lib/Constants.php
index e40e1971c0..4d90fe1d6a 100644
--- a/lib/Constants.php
+++ b/lib/Constants.php
@@ -91,6 +91,7 @@ class Constants {
 	public const ANSWER_TYPE_DATE = 'date';
 	public const ANSWER_TYPE_DATETIME = 'datetime';
 	public const ANSWER_TYPE_TIME = 'time';
+	public const ANSWER_TYPE_FILE = 'file';
 
 	// All AnswerTypes
 	public const ANSWER_TYPES = [
@@ -101,7 +102,8 @@ class Constants {
 		self::ANSWER_TYPE_LONG,
 		self::ANSWER_TYPE_DATE,
 		self::ANSWER_TYPE_DATETIME,
-		self::ANSWER_TYPE_TIME
+		self::ANSWER_TYPE_TIME,
+		self::ANSWER_TYPE_FILE,
 	];
 
 	// AnswerTypes, that need/have predefined Options
@@ -155,6 +157,21 @@ class Constants {
 		'validationRegex' => ['string'],
 	];
 
+	public const EXTRA_SETTINGS_FILE = [
+		'allowedFileTypes' => ['array'],
+		'allowedFileExtensions' => ['array'],
+		'maxAllowedFilesCount' => ['integer'],
+		'maxFileSize' => ['integer'],
+	];
+
+	// should be in sync with FileTypes.js
+	public const EXTRA_SETTINGS_ALLOWED_FILE_TYPES = [
+		'image',
+		'x-office/document',
+		'x-office/presentation',
+		'x-office/spreadsheet',
+	];
+
 	/**
 	 * !! Keep in sync with src/mixins/ShareTypes.js !!
 	 */
@@ -204,4 +221,8 @@ class Constants {
 	];
 
 	public const DEFAULT_FILE_FORMAT = 'csv';
+
+	public const UNSUBMITTED_FILES_FOLDER = self::FILES_FOLDER . '/unsubmitted';
+
+	public const FILES_FOLDER = 'forms';
 }
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index ad0a9bcc8d..b2efe1d8db 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -40,6 +40,8 @@
 use OCA\Forms\Db\ShareMapper;
 use OCA\Forms\Db\Submission;
 use OCA\Forms\Db\SubmissionMapper;
+use OCA\Forms\Db\UploadedFile;
+use OCA\Forms\Db\UploadedFileMapper;
 use OCA\Forms\Service\ConfigService;
 use OCA\Forms\Service\FormsService;
 use OCA\Forms\Service\SubmissionService;
@@ -48,10 +50,13 @@
 use OCP\AppFramework\Db\IMapperException;
 use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IL10N;
 use OCP\IRequest;
@@ -81,6 +86,9 @@ public function __construct(
 		private IL10N $l10n,
 		private LoggerInterface $logger,
 		private IUserManager $userManager,
+		private IRootFolder $storage,
+		private UploadedFileMapper $uploadedFileMapper,
+		private IMimeTypeDetector $mimeTypeDetector,
 	) {
 		parent::__construct($appName, $request);
 		$this->currentUser = $userSession->getUser();
@@ -438,6 +446,7 @@ public function newQuestion(int $formId, string $type, string $text = ''): DataR
 
 		$response = $question->read();
 		$response['options'] = [];
+		$response['accept'] = [];
 
 		$this->formsService->setLastUpdatedTimestamp($formId);
 
@@ -696,6 +705,7 @@ public function cloneQuestion(int $id): DataResponse {
 
 		$response = $newQuestion->read();
 		$response['options'] = [];
+		$response['accept'] = [];
 
 		foreach ($sourceOptions as $sourceOption) {
 			$optionData = $sourceOption->read();
@@ -918,14 +928,19 @@ public function getSubmissions(string $hash): DataResponse {
 	/**
 	 * Insert answers for a question
 	 *
+	 * @param Form $form
 	 * @param int $submissionId
 	 * @param array $question
-	 * @param array $answerArray [arrayOfString]
+	 * @param string[]|array<array{uploadedFileId: string, uploadedFileName: string}> $answerArray
 	 */
-	private function storeAnswersForQuestion($submissionId, array $question, array $answerArray) {
+	private function storeAnswersForQuestion(Form $form, $submissionId, array $question, array $answerArray) {
 		foreach ($answerArray as $answer) {
-			$answerText = '';
+			$answerEntity = new Answer();
+			$answerEntity->setSubmissionId($submissionId);
+			$answerEntity->setQuestionId($question['id']);
 
+			$answerText = '';
+			$uploadedFile = null;
 			// Are we using answer ids as values
 			if (in_array($question['type'], Constants::ANSWER_TYPES_PREDEFINED)) {
 				// Search corresponding option, skip processing if not found
@@ -935,6 +950,25 @@ private function storeAnswersForQuestion($submissionId, array $question, array $
 				} elseif (!empty($question['extraSettings']['allowOtherAnswer']) && strpos($answer, Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX) === 0) {
 					$answerText = str_replace(Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX, "", $answer);
 				}
+			} elseif ($question['type'] === Constants::ANSWER_TYPE_FILE) {
+				$uploadedFile = $this->uploadedFileMapper->getByUploadedFileId($answer['uploadedFileId']);
+				$answerEntity->setFileId($uploadedFile->getFileId());
+
+				$userFolder = $this->storage->getUserFolder($form->getOwnerId());
+				$path = $this->formsService->getUploadedFilePath($form, $submissionId, $question['id'], $question['name'], $question['text']);
+
+				if ($userFolder->nodeExists($path)) {
+					$folder = $userFolder->get($path);
+				} else {
+					$folder = $userFolder->newFolder($path);
+				}
+				/** @var \OCP\Files\Folder $folder */
+
+				$file = $userFolder->getById($uploadedFile->getFileId())[0];
+				$name = $folder->getNonExistingName($file->getName());
+				$file->move($folder->getPath() . '/' . $name);
+
+				$answerText = $name;
 			} else {
 				$answerText = $answer; // Not a multiple-question, answerText is given answer
 			}
@@ -943,14 +977,132 @@ private function storeAnswersForQuestion($submissionId, array $question, array $
 				continue;
 			}
 
-			$answerEntity = new Answer();
-			$answerEntity->setSubmissionId($submissionId);
-			$answerEntity->setQuestionId($question['id']);
 			$answerEntity->setText($answerText);
 			$this->answerMapper->insert($answerEntity);
+			if ($uploadedFile) {
+				$this->uploadedFileMapper->delete($uploadedFile);
+			}
 		}
 	}
 
+	/**
+	 * @CORS
+	 * @NoAdminRequired
+	 * @PublicPage
+	 *
+	 * Uploads a temporary files to the server during form filling
+	 *
+	 * @return Response
+	 */
+	public function uploadFiles(int $formId, int $questionId, string $shareHash = ''): Response {
+		$this->logger->debug('Uploading files for formId: {formId}, questionId: {questionId}',
+			['formId' => $formId, 'questionId' => $questionId]);
+
+		$uploadedFiles = [];
+		foreach ($this->request->getUploadedFile('files') as $key => $files) {
+			foreach ($files as $i => $value) {
+				$uploadedFiles[$i][$key] = $value;
+			}
+		}
+
+		if (!count($uploadedFiles)) {
+			throw new OCSBadRequestException('No files provided');
+		}
+
+		$form = $this->loadFormForSubmission($formId, $shareHash);
+
+		if (!$this->formsService->canSubmit($form)) {
+			throw new OCSForbiddenException('Already submitted');
+		}
+
+		try {
+			$question = $this->questionMapper->findById($questionId);
+		} catch (IMapperException $e) {
+			$this->logger->debug('Could not find question with id {questionId}', ['questionId' => $questionId]);
+			throw new OCSBadRequestException(previous: $e instanceof \Exception ? $e : null);
+		}
+
+		$path = $this->formsService->getTemporaryUploadedFilePath($form, $question);
+
+		$response = [];
+		foreach ($uploadedFiles as $uploadedFile) {
+			$error = $uploadedFile['error'] ?? 0;
+			if ($error !== UPLOAD_ERR_OK) {
+				$this->logger->error('Failed to get the uploaded file. PHP file upload error code: ' . $error,
+					['file_name' => $uploadedFile['name']]);
+
+				throw new OCSBadRequestException(sprintf('Failed to upload the file "%s".', $uploadedFile['name']));
+			}
+
+			if (!is_uploaded_file($uploadedFile['tmp_name'])) {
+				throw new OCSBadRequestException('Invalid file provided');
+			}
+
+			$userFolder = $this->storage->getUserFolder($form->getOwnerId());
+			$userFolder->getStorage()->verifyPath($path, $uploadedFile['name']);
+
+			$extraSettings = $question->getExtraSettings();
+			if (($extraSettings['maxFileSize'] ?? 0) > 0 && $uploadedFile['size'] > $extraSettings['maxFileSize']) {
+				throw new OCSBadRequestException(sprintf('File size exceeds the maximum allowed size of %s bytes.', $extraSettings['maxFileSize']));
+			}
+
+			if (!empty($extraSettings['allowedFileTypes']) || !empty($extraSettings['allowedFileExtensions'])) {
+				$mimeType = $this->mimeTypeDetector->detectContent($uploadedFile['tmp_name']);
+				$aliases = $this->mimeTypeDetector->getAllAliases();
+
+				$valid = false;
+				foreach ($extraSettings['allowedFileTypes'] ?? [] as $allowedFileType) {
+					if (str_starts_with($aliases[$mimeType] ?? '', $allowedFileType)) {
+						$valid = true;
+						break;
+					}
+				}
+
+				if (!$valid && !empty($extraSettings['allowedFileExtensions'])) {
+					$mimeTypesPerExtension = method_exists($this->mimeTypeDetector, 'getAllMappings')
+						? $this->mimeTypeDetector->getAllMappings() : [];
+					foreach ($extraSettings['allowedFileExtensions'] as $allowedFileExtension) {
+						if (isset($mimeTypesPerExtension[$allowedFileExtension])
+							&& in_array($mimeType, $mimeTypesPerExtension[$allowedFileExtension])) {
+							$valid = true;
+							break;
+						}
+					}
+				}
+
+				if (!$valid) {
+					throw new OCSBadRequestException(sprintf('File type is not allowed. Allowed file types: %s',
+						implode(', ', array_merge($extraSettings['allowedFileTypes'] ?? [], $extraSettings['allowedFileExtensions'] ?? []))
+					));
+				}
+			}
+
+			if ($userFolder->nodeExists($path)) {
+				$folder = $userFolder->get($path);
+			} else {
+				$folder = $userFolder->newFolder($path);
+			}
+			/** @var \OCP\Files\Folder $folder */
+
+			$fileName = $folder->getNonExistingName($uploadedFile['name']);
+			$file = $folder->newFile($fileName, file_get_contents($uploadedFile['tmp_name']));
+
+			$uploadedFileEntity = new UploadedFile();
+			$uploadedFileEntity->setFormId($formId);
+			$uploadedFileEntity->setOriginalFileName($fileName);
+			$uploadedFileEntity->setFileId($file->getId());
+			$uploadedFileEntity->setCreated(time());
+			$this->uploadedFileMapper->insert($uploadedFileEntity);
+
+			$response[] = [
+				'uploadedFileId' => $uploadedFileEntity->getId(),
+				'fileName' => $fileName,
+			];
+		}
+
+		return new DataResponse($response);
+	}
+
 	/**
 	 * @CORS
 	 * @NoAdminRequired
@@ -973,47 +1125,15 @@ public function insertSubmission(int $formId, array $answers, string $shareHash
 			'shareHash' => $shareHash,
 		]);
 
-		try {
-			$form = $this->formMapper->findById($formId);
-			$questions = $this->formsService->getQuestions($formId);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}
-
-		// Does the user have access to the form (Either by logged in user, or by providing public share-hash.)
-		try {
-			$isPublicShare = false;
-
-			// If hash given, find the corresponding share & check if hash corresponds to given formId.
-			if ($shareHash !== '') {
-				// public by legacy Link
-				if (isset($form->getAccess()['legacyLink']) && $shareHash === $form->getHash()) {
-					$isPublicShare = true;
-				}
-
-				// Public link share
-				$share = $this->shareMapper->findPublicShareByHash($shareHash);
-				if ($share->getFormId() === $formId) {
-					$isPublicShare = true;
-				}
-			}
-		} catch (DoesNotExistException $e) {
-			// $isPublicShare already false.
-		} finally {
-			// Now forbid, if no public share and no direct share.
-			if (!$isPublicShare && !$this->formsService->hasUserAccess($form)) {
-				throw new OCSForbiddenException('Not allowed to access this form');
-			}
-		}
-
-		// Not allowed if form has expired.
-		if ($this->formsService->hasFormExpired($form)) {
-			throw new OCSForbiddenException('This form is no longer taking answers');
-		}
+		$form = $this->loadFormForSubmission($formId, $shareHash);
 
+		$questions = $this->formsService->getQuestions($formId);
 		// Is the submission valid
-		if (!$this->submissionService->validateSubmission($questions, $answers)) {
+		$isSubmissionValid = $this->submissionService->validateSubmission($questions, $answers, $form->getOwnerId());
+		if (is_string($isSubmissionValid)) {
+			throw new OCSBadRequestException($isSubmissionValid);
+		}
+		if ($isSubmissionValid === false) {
 			throw new OCSBadRequestException('At least one submitted answer is not valid');
 		}
 
@@ -1054,7 +1174,7 @@ public function insertSubmission(int $formId, array $answers, string $shareHash
 				continue;
 			}
 
-			$this->storeAnswersForQuestion($submission->getId(), $questions[$questionIndex], $answerArray);
+			$this->storeAnswersForQuestion($form, $submission->getId(), $questions[$questionIndex], $answerArray);
 		}
 
 		$this->formsService->setLastUpdatedTimestamp($formId);
@@ -1301,6 +1421,48 @@ public function linkFile(string $hash, string $path, string $fileFormat): DataRe
 		]);
 	}
 
+	private function loadFormForSubmission(int $formId, string $shareHash): Form {
+		try {
+			$form = $this->formMapper->findById($formId);
+		} catch (IMapperException $e) {
+			$this->logger->debug('Could not find form');
+			throw new OCSBadRequestException(previous: $e instanceof \Exception ? $e : null);
+		}
+
+		// Does the user have access to the form (Either by logged-in user, or by providing public share-hash.)
+		try {
+			$isPublicShare = false;
+
+			// If hash given, find the corresponding share & check if hash corresponds to given formId.
+			if ($shareHash !== '') {
+				// public by legacy Link
+				if (isset($form->getAccess()['legacyLink']) && $shareHash === $form->getHash()) {
+					$isPublicShare = true;
+				}
+
+				// Public link share
+				$share = $this->shareMapper->findPublicShareByHash($shareHash);
+				if ($share->getFormId() === $formId) {
+					$isPublicShare = true;
+				}
+			}
+		} catch (DoesNotExistException $e) {
+			// $isPublicShare already false.
+		} finally {
+			// Now forbid, if no public share and no direct share.
+			if (!$isPublicShare && !$this->formsService->hasUserAccess($form)) {
+				throw new OCSForbiddenException('Not allowed to access this form');
+			}
+		}
+
+		// Not allowed if form has expired.
+		if ($this->formsService->hasFormExpired($form)) {
+			throw new OCSForbiddenException('This form is no longer taking answers');
+		}
+
+		return $form;
+	}
+
 	/**
 	 * Helper that retrieves a form if the current user is allowed to edit it
 	 * This throws an exception in case either the form is not found or permissions are missing.
diff --git a/lib/Controller/ShareApiController.php b/lib/Controller/ShareApiController.php
index 3abf38043a..07bc5bcdec 100644
--- a/lib/Controller/ShareApiController.php
+++ b/lib/Controller/ShareApiController.php
@@ -41,6 +41,7 @@
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCSController;
+use OCP\Files\IRootFolder;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IRequest;
@@ -48,6 +49,7 @@
 use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Security\ISecureRandom;
+use OCP\Share\IManager;
 use OCP\Share\IShare;
 use Psr\Log\LoggerInterface;
 
@@ -67,6 +69,8 @@ public function __construct(
 		private IUserManager $userManager,
 		private ISecureRandom $secureRandom,
 		private CirclesService $circlesService,
+		private IRootFolder $storage,
+		private IManager $shareManager,
 	) {
 		parent::__construct($appName, $request);
 		$this->currentUser = $userSession->getUser();
@@ -189,7 +193,7 @@ public function newShare(int $formId, int $shareType, string $shareWith = '', ar
 
 		// Create share-notifications (activity)
 		$this->formsService->notifyNewShares($form, $share);
-		
+
 		$this->formsService->setLastUpdatedTimestamp($formId);
 
 		// Append displayName for Frontend
@@ -254,8 +258,8 @@ public function updateShare(int $id, array $keyValuePairs): DataResponse {
 		]);
 
 		try {
-			$share = $this->shareMapper->findById($id);
-			$form = $this->formMapper->findById($share->getFormId());
+			$formShare = $this->shareMapper->findById($id);
+			$form = $this->formMapper->findById($formShare->getFormId());
 		} catch (IMapperException $e) {
 			$this->logger->debug('Could not find share', ['exception' => $e]);
 			throw new OCSBadRequestException('Could not find share');
@@ -278,16 +282,46 @@ public function updateShare(int $id, array $keyValuePairs): DataResponse {
 			throw new OCSForbiddenException();
 		}
 
-		if (!$this->validatePermissions($keyValuePairs['permissions'], $share->getShareType())) {
+		if (!$this->validatePermissions($keyValuePairs['permissions'], $formShare->getShareType())) {
 			throw new OCSBadRequestException('Invalid permission given');
 		}
 
-		$share->setPermissions($keyValuePairs['permissions']);
-		$share = $this->shareMapper->update($share);
+		$formShare->setPermissions($keyValuePairs['permissions']);
+		$formShare = $this->shareMapper->update($formShare);
+
+		if (in_array($formShare->getShareType(), [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP, IShare::TYPE_CIRCLE], true)) {
+			$userFolder = $this->storage->getUserFolder($form->getOwnerId());
+			$uploadedFilesFolderPath = $this->formsService->getFormUploadedFilesFolderPath($form);
+			if ($userFolder->nodeExists($uploadedFilesFolderPath)) {
+				$folder = $userFolder->get($uploadedFilesFolderPath);
+			} else {
+				$folder = $userFolder->newFolder($uploadedFilesFolderPath);
+			}
+			/** @var \OCP\Files\Folder $folder */
+
+			if (in_array(Constants::PERMISSION_RESULTS, $keyValuePairs['permissions'], true)) {
+				$folderShare = $this->shareManager->newShare();
+				$folderShare->setShareType($formShare->getShareType());
+				$folderShare->setSharedWith($formShare->getShareWith());
+				$folderShare->setSharedBy($form->getOwnerId());
+				$folderShare->setPermissions(\OCP\Constants::PERMISSION_READ);
+				$folderShare->setNode($folder);
+				$folderShare->setShareOwner($form->getOwnerId());
+
+				$this->shareManager->createShare($folderShare);
+			} else {
+				$folderShares = $this->shareManager->getSharesBy($form->getOwnerId(), $formShare->getShareType(), $folder);
+				foreach ($folderShares as $folderShare) {
+					if ($folderShare->getSharedWith() === $formShare->getShareWith()) {
+						$this->shareManager->deleteShare($folderShare);
+					}
+				}
+			}
+		}
 
 		$this->formsService->setLastUpdatedTimestamp($form->getId());
 
-		return new DataResponse($share->getId());
+		return new DataResponse($formShare->getId());
 	}
 
 	/**
diff --git a/lib/Db/Answer.php b/lib/Db/Answer.php
index 0e5c2e911e..2b6097cd47 100644
--- a/lib/Db/Answer.php
+++ b/lib/Db/Answer.php
@@ -35,12 +35,15 @@
  * @method void setSubmissionId(integer $value)
  * @method integer getQuestionId()
  * @method void setQuestionId(integer $value)
+ * @method integer|null getFileId()
+ * @method void setFileId(?integer $value)
  * @method string getText()
  * @method void setText(string $value)
  */
 class Answer extends Entity {
 	protected $submissionId;
 	protected $questionId;
+	protected $fileId;
 	protected $text;
 
 	/**
@@ -49,12 +52,14 @@ class Answer extends Entity {
 	public function __construct() {
 		$this->addType('submissionId', 'integer');
 		$this->addType('questionId', 'integer');
+		$this->addType('fileId', 'integer');
 	}
 
 	public function read(): array {
 		return [
 			'id' => $this->getId(),
 			'submissionId' => $this->getSubmissionId(),
+			'fileId' => $this->getFileId(),
 			'questionId' => $this->getQuestionId(),
 			'text' => (string)$this->getText(),
 		];
diff --git a/lib/Db/Question.php b/lib/Db/Question.php
index e4f97e1777..02fa517b5c 100644
--- a/lib/Db/Question.php
+++ b/lib/Db/Question.php
@@ -48,8 +48,6 @@
  * @method void setDescription(string $value)
  * @method string getName()
  * @method void setName(string $value)
- * @method object getExtraSettings()
- * @method void setExtraSettings(object $value)
  */
 class Question extends Entity {
 	protected $formId;
@@ -82,7 +80,7 @@ public function setExtraSettings(array $extraSettings) {
 				unset($extraSettings[$key]);
 			}
 		}
-		
+
 		$this->setExtraSettingsJson(json_encode($extraSettings, JSON_FORCE_OBJECT));
 	}
 
diff --git a/lib/Db/UploadedFile.php b/lib/Db/UploadedFile.php
new file mode 100644
index 0000000000..8e037db1d0
--- /dev/null
+++ b/lib/Db/UploadedFile.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2024 Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @author Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * 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\Db;
+
+use OCP\AppFramework\Db\Entity;
+
+/**
+ * @method integer getFormId()
+ * @method void setFormId(integer $value)
+ * @method string getOriginalFileName()
+ * @method void setOriginalFileName(string $value)
+ * @method integer getFileId()
+ * @method void setFileId(integer $value)
+ * @method integer getCreated()
+ * @method void setCreated(integer $value)
+ */
+class UploadedFile extends Entity {
+	protected $formId;
+	protected $originalFileName;
+	protected $fileId;
+	protected $created;
+
+	/**
+	 * Answer constructor.
+	 */
+	public function __construct() {
+		$this->addType('formId', 'integer');
+		$this->addType('originalFileName', 'string');
+		$this->addType('fileId', 'integer');
+		$this->addType('created', 'integer');
+	}
+
+	public function read(): array {
+		return [
+			'id' => $this->getId(),
+			'formId' => $this->getFormId(),
+			'originalFileName' => $this->getOriginalFileName(),
+			'fileId' => $this->getFileId(),
+			'created' => $this->getCreated(),
+		];
+	}
+}
diff --git a/lib/Db/UploadedFileMapper.php b/lib/Db/UploadedFileMapper.php
new file mode 100644
index 0000000000..ca3eeba12a
--- /dev/null
+++ b/lib/Db/UploadedFileMapper.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @copyright Copyright (c) 2024 Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @author Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * 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\Db;
+
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\QBMapper;
+use OCP\IDBConnection;
+
+/**
+ * @extends QBMapper<UploadedFile>
+ */
+class UploadedFileMapper extends QBMapper {
+
+	/**
+	 * AnswerMapper constructor.
+	 * @param IDBConnection $db
+	 */
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'forms_v2_uploaded_files', UploadedFile::class);
+	}
+
+	/**
+	 * @param string $uploadedFileId
+	 * @return UploadedFile|null
+	 */
+	public function findByUploadedFileId(string $uploadedFileId): ?UploadedFile {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->select('*')
+			->from($this->getTableName())
+			->where(
+				$qb->expr()->eq('id', $qb->createNamedParameter($uploadedFileId))
+			);
+
+		return $this->findEntities($qb)[0] ?? null;
+	}
+
+	/**
+	 * @param string $uploadedFileId
+	 * @throws DoesNotExistException if not found
+	 * @return UploadedFile
+	 */
+	public function getByUploadedFileId(string $uploadedFileId): UploadedFile {
+		$uploadedFile = $this->findByUploadedFileId($uploadedFileId);
+		if ($uploadedFile === null) {
+			throw new DoesNotExistException(sprintf('Uploaded file with id "%s" not found', $uploadedFileId));
+		}
+
+		return $uploadedFile;
+	}
+
+	/**
+	 * @param \DateTimeImmutable $dateTime
+	 * @return UploadedFile[]
+	 */
+	public function findUploadedEarlierThan(\DateTimeImmutable $dateTime): array {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->select('*')
+			->from($this->getTableName())
+			->where(
+				$qb->expr()->lt('created', $qb->createNamedParameter($dateTime->getTimestamp()))
+			);
+
+		return $this->findEntities($qb);
+	}
+}
diff --git a/lib/Migration/Version040300Date20240523123456.php b/lib/Migration/Version040300Date20240523123456.php
new file mode 100644
index 0000000000..0477db64a7
--- /dev/null
+++ b/lib/Migration/Version040300Date20240523123456.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2024 Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @author Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @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 Version040300Date20240523123456 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();
+
+		$answersTable = $schema->getTable('forms_v2_answers');
+		if (!$answersTable->hasColumn('file_id')) {
+			$answersTable->addColumn('file_id', Types::BIGINT, [
+				'notnull' => false,
+				'default' => null,
+				'length' => 11,
+				'unsigned' => true,
+			]);
+		}
+
+		if (!$schema->hasTable('forms_v2_uploaded_files')) {
+			$table = $schema->createTable('forms_v2_uploaded_files');
+			$table->addColumn('id', Types::INTEGER, [
+				'autoincrement' => true,
+				'notnull' => true,
+			]);
+			$table->addColumn('form_id', Types::INTEGER, [
+				'notnull' => true,
+			]);
+			$table->addColumn('original_file_name', Types::STRING, [
+				'notnull' => true,
+				'length' => 256,
+			]);
+			$table->addColumn('file_id', Types::BIGINT, [
+				'notnull' => false,
+				'default' => null,
+				'length' => 11,
+				'unsigned' => true,
+			]);
+			$table->addColumn('created', Types::INTEGER, [
+				'notnull' => false,
+				'comment' => 'unix-timestamp',
+			]);
+			$table->setPrimaryKey(['id'], 'id');
+		}
+
+		return $schema;
+	}
+}
diff --git a/lib/Service/FormsService.php b/lib/Service/FormsService.php
index 4f65be536c..4679a50b73 100644
--- a/lib/Service/FormsService.php
+++ b/lib/Service/FormsService.php
@@ -29,12 +29,14 @@
 use OCA\Forms\Db\Form;
 use OCA\Forms\Db\FormMapper;
 use OCA\Forms\Db\OptionMapper;
+use OCA\Forms\Db\Question;
 use OCA\Forms\Db\QuestionMapper;
 use OCA\Forms\Db\Share;
 use OCA\Forms\Db\ShareMapper;
 use OCA\Forms\Db\SubmissionMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\IMapperException;
+use OCP\Files\IMimeTypeDetector;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IGroup;
@@ -69,6 +71,7 @@ public function __construct(
 		private CirclesService $circlesService,
 		private IRootFolder $storage,
 		private IL10N $l10n,
+		private IMimeTypeDetector $mimeTypeDetector,
 	) {
 		$this->currentUser = $userSession->getUser();
 	}
@@ -116,6 +119,25 @@ public function getQuestions(int $formId): array {
 			foreach ($questionEntities as $questionEntity) {
 				$question = $questionEntity->read();
 				$question['options'] = $this->getOptions($question['id']);
+				$question['accept'] = [];
+				if ($question['type'] === Constants::ANSWER_TYPE_FILE) {
+					if ($question['extraSettings']['allowedFileTypes'] ?? null) {
+						$aliases = $this->mimeTypeDetector->getAllAliases();
+
+						foreach ($question['extraSettings']['allowedFileTypes'] as $type) {
+							$question['accept'] = array_keys(array_filter($aliases, function (string $alias) use ($type) {
+								return $alias === $type;
+							}));
+						}
+					}
+
+					if ($question['extraSettings']['allowedFileExtensions'] ?? null) {
+						foreach ($question['extraSettings']['allowedFileExtensions'] as $extension) {
+							$question['accept'][] = '.' . $extension;
+						}
+					}
+				}
+
 				$questionList[] = $question;
 			}
 		} catch (DoesNotExistException $e) {
@@ -596,6 +618,9 @@ public function areExtraSettingsValid(array $extraSettings, string $questionType
 			case Constants::ANSWER_TYPE_SHORT:
 				$allowed = Constants::EXTRA_SETTINGS_SHORT;
 				break;
+			case Constants::ANSWER_TYPE_FILE:
+				$allowed = Constants::EXTRA_SETTINGS_FILE;
+				break;
 			default:
 				$allowed = [];
 		}
@@ -696,8 +721,35 @@ public function getFileName(Form $form, string $fileFormat): string {
 		// TRANSLATORS Appendix for CSV-Export: 'Form Title (responses).csv'
 		$fileName = $form->getTitle() . ' (' . $this->l10n->t('responses') . ').'.$fileFormat;
 
-		// Sanitize file name, replace all invalid characters
-		return str_replace(mb_str_split(\OCP\Constants::FILENAME_INVALID_CHARS), '-', $fileName);
+		return self::normalizeFileName($fileName);
+	}
+
+	public function getFormUploadedFilesFolderPath(Form $form): string {
+		return implode('/', [
+			Constants::FILES_FOLDER,
+			self::normalizeFileName($form->getId().' - '.$form->getTitle()),
+		]);
+	}
+
+	public function getUploadedFilePath(Form $form, int $submissionId, int $questionId, ?string $questionName, string $questionText): string {
+
+		return implode('/', [
+			$this->getFormUploadedFilesFolderPath($form),
+			$submissionId,
+			self::normalizeFileName($questionId.' - '.($questionName ?: $questionText))
+		]);
 	}
 
+	public function getTemporaryUploadedFilePath(Form $form, Question $question): string {
+		return implode('/', [
+			Constants::UNSUBMITTED_FILES_FOLDER,
+			microtime(true),
+			self::normalizeFileName($form->getId().' - '.$form->getTitle()),
+			self::normalizeFileName($question->getId().' - '.($question->getName() ?: $question->getText()))
+		]);
+	}
+
+	private static function normalizeFileName(string $fileName): string {
+		return str_replace(mb_str_split(\OCP\Constants::FILENAME_INVALID_CHARS), '-', $fileName);
+	}
 }
diff --git a/lib/Service/SubmissionService.php b/lib/Service/SubmissionService.php
index d4c942b99d..308c854384 100644
--- a/lib/Service/SubmissionService.php
+++ b/lib/Service/SubmissionService.php
@@ -33,9 +33,11 @@
 use OCA\Forms\Db\AnswerMapper;
 use OCA\Forms\Db\Form;
 use OCA\Forms\Db\FormMapper;
+use OCA\Forms\Db\Question;
 use OCA\Forms\Db\QuestionMapper;
 use OCA\Forms\Db\Submission;
 use OCA\Forms\Db\SubmissionMapper;
+use OCA\Forms\Db\UploadedFileMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\Files\File;
@@ -45,6 +47,7 @@
 
 use OCP\IL10N;
 use OCP\ITempManager;
+use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
@@ -103,6 +106,8 @@ public function __construct(FormMapper $formMapper,
 		IMailer $mailer,
 		private ITempManager $tempManager,
 		private FormsService $formsService,
+		private IUrlGenerator $urlGenerator,
+		private UploadedFileMapper $uploadedFileMapper,
 	) {
 		$this->formMapper = $formMapper;
 		$this->questionMapper = $questionMapper;
@@ -266,8 +271,11 @@ public function getSubmissionsData(Form $form, string $fileFormat, ?File $file =
 		$header[] = $this->l10n->t('User ID');
 		$header[] = $this->l10n->t('User display name');
 		$header[] = $this->l10n->t('Timestamp');
+		/** @var array<int, Question> $questionPerQuestionId */
+		$questionPerQuestionId = [];
 		foreach ($questions as $question) {
 			$header[] = $question->getText();
+			$questionPerQuestionId[$question->getId()] = $question;
 		}
 
 		// Init dataset
@@ -293,18 +301,30 @@ public function getSubmissionsData(Form $form, string $fileFormat, ?File $file =
 			$row[] = date_format(date_timestamp_set(new DateTime(), $submission->getTimestamp())->setTimezone(new DateTimeZone($userTimezone)), 'c');
 
 			// Answers, make sure we keep the question order
-			$answers = array_reduce($this->answerMapper->findBySubmission($submission->getId()), function (array $carry, Answer $answer) {
-				$questionId = $answer->getQuestionId();
-
-				// If key exists, insert separator
-				if (array_key_exists($questionId, $carry)) {
-					$carry[$questionId] .= '; ' . $answer->getText();
-				} else {
-					$carry[$questionId] = $answer->getText();
-				}
+			$answers = array_reduce($this->answerMapper->findBySubmission($submission->getId()),
+				function (array $carry, Answer $answer) use ($questionPerQuestionId) {
+					$questionId = $answer->getQuestionId();
+
+					if (isset($questionPerQuestionId[$questionId]) &&
+						$questionPerQuestionId[$questionId]->getType() === Constants::ANSWER_TYPE_FILE) {
+						if (array_key_exists($questionId, $carry)) {
+							$carry[$questionId]['label'] .= "; \n" . $answer->getText();
+						} else {
+							$carry[$questionId] = [
+								'label' => $answer->getText(),
+								'url' => $this->urlGenerator->linkToRouteAbsolute('files.View.showFile', ['fileid' => $answer->getFileId()])
+							];
+						}
+					} else {
+						if (array_key_exists($questionId, $carry)) {
+							$carry[$questionId] .= '; ' . $answer->getText();
+						} else {
+							$carry[$questionId] = $answer->getText();
+						}
+					}
 
-				return $carry;
-			}, []);
+					return $carry;
+				}, []);
 
 			foreach ($questions as $question) {
 				$row[] = $answers[$question->getId()] ?? null;
@@ -318,7 +338,7 @@ public function getSubmissionsData(Form $form, string $fileFormat, ?File $file =
 
 	/**
 	 * @param array<int, string> $header
-	 * @param array<int, array<int, string>> $data
+	 * @param array<int, array<int, string>|non-empty-list<array{label: string, url: string}>> $data
 	 */
 	private function exportData(array $header, array $data, string $fileFormat, ?File $file = null): string {
 		if ($file && $file->getContent()) {
@@ -333,9 +353,23 @@ private function exportData(array $header, array $data, string $fileFormat, ?Fil
 		foreach ($header as $columnIndex => $value) {
 			$activeWorksheet->setCellValue([$columnIndex + 1, 1], $value);
 		}
-		foreach ($data as $rowIndex => $row) {
-			foreach ($row as $columnIndex => $value) {
-				$activeWorksheet->setCellValue([$columnIndex + 1, $rowIndex + 2], $value);
+		foreach ($data as $rowIndex => $rowData) {
+			foreach ($rowData as $columnIndex => $value) {
+				$column = $columnIndex + 1;
+				$row = $rowIndex + 2;
+
+				if (is_array($value)) {
+					$activeWorksheet->getCell([$column, $row])
+						->setValueExplicit($value['label'])
+						->getHyperlink()
+						->setUrl($value['url']);
+
+					$activeWorksheet->getStyle([$column, $row])
+						->getAlignment()
+						->setWrapText(true);
+				} else {
+					$activeWorksheet->setCellValue([$column, $row], $value);
+				}
 			}
 		}
 
@@ -353,9 +387,10 @@ private function exportData(array $header, array $data, string $fileFormat, ?Fil
 	 * Validate all answers against the questions
 	 * @param array $questions Array of the questions of the form
 	 * @param array $answers Array of the submitted answers
-	 * @return boolean If the submission is valid
+	 * @param string $formOwnerId Owner of the form
+	 * @return boolean|string True for valid submission, false or error message for invalid
 	 */
-	public function validateSubmission(array $questions, array $answers): bool {
+	public function validateSubmission(array $questions, array $answers, string $formOwnerId): bool|string {
 		// Check by questions
 		foreach ($questions as $question) {
 			$questionId = $question['id'];
@@ -364,13 +399,20 @@ public function validateSubmission(array $questions, array $answers): bool {
 			// Check if all required questions have an answer
 			if ($question['isRequired'] &&
 				(!$questionAnswered ||
-				!array_filter($answers[$questionId], 'strlen') ||
+				!array_filter($answers[$questionId], function (string|array $value): bool {
+					// file type
+					if (is_array($value)) {
+						return !empty($value['uploadedFileId']);
+					}
+
+					return $value !== '';
+				}) ||
 				(!empty($question['extraSettings']['allowOtherAnswer']) && !array_filter($answers[$questionId], fn ($value) => $value !== Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX)))
 			) {
 				return false;
 			}
 
-			// Perform further checks only for answered questions - otherwise early return
+			// Perform further checks only for answered questions
 			if (!$questionAnswered) {
 				continue;
 			}
@@ -385,8 +427,8 @@ public function validateSubmission(array $questions, array $answers): bool {
 					|| ($maxOptions > 0 && $answersCount > $maxOptions)) {
 					return false;
 				}
-			} elseif ($answersCount > 1) {
-				// Check if non multiple questions have not more than one answer
+			} elseif ($answersCount > 1 && $question['type'] !== Constants::ANSWER_TYPE_FILE) {
+				// Check if non-multiple questions have not more than one answer
 				return false;
 			}
 
@@ -413,6 +455,25 @@ public function validateSubmission(array $questions, array $answers): bool {
 			if ($question['type'] === Constants::ANSWER_TYPE_SHORT && !$this->validateShortQuestion($question, $answers[$questionId][0])) {
 				return false;
 			}
+
+			if ($question['type'] === Constants::ANSWER_TYPE_FILE) {
+				$maxAllowedFilesCount = $question['extraSettings']['maxAllowedFilesCount'] ?? 0;
+				if ($maxAllowedFilesCount > 0 && count($answers[$questionId]) > $maxAllowedFilesCount) {
+					return sprintf('Too many files uploaded for question "%s". Maximum allowed: %d', $question['text'], $maxAllowedFilesCount);
+				}
+
+				foreach ($answers[$questionId] as $answer) {
+					$uploadedFile = $this->uploadedFileMapper->findByUploadedFileId($answer['uploadedFileId']);
+					if (!$uploadedFile) {
+						return sprintf('File "%s" for question "%s" not exists anymore. Please delete and re-upload the file.', $answer['fileName'] ?? $answer['uploadedFileId'], $question['text']);
+					}
+
+					$nodes = $this->storage->getUserFolder($formOwnerId)->getById($uploadedFile->getFileId());
+					if (empty($nodes)) {
+						return sprintf('File "%s" for question "%s" not exists anymore. Please delete and re-upload the file.', $answer['fileName'] ?? $answer['uploadedFileId'], $question['text']);
+					}
+				}
+			}
 		}
 
 		// Check for excess answers
diff --git a/package-lock.json b/package-lock.json
index 65ba3e12df..a23b01be52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@nextcloud/axios": "^2.5.0",
         "@nextcloud/dialogs": "^5.3.1",
         "@nextcloud/event-bus": "^3.3.1",
+        "@nextcloud/files": "^3.2.1",
         "@nextcloud/initial-state": "^2.2.0",
         "@nextcloud/l10n": "^3.1.0",
         "@nextcloud/logger": "^3.0.2",
@@ -1773,64 +1774,22 @@
       }
     },
     "node_modules/@nextcloud/files": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.2.0.tgz",
-      "integrity": "sha512-3EQBR758bzvqcNRzcp1etHGGkCZgK6wS9or8iQpzIOKf4B2tAe1O+hXA8GzPiQ5ZlGIPblOlMOEMlRg1KD49hg==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.4.0.tgz",
+      "integrity": "sha512-VfVI9bQVcORKpVA8WJDf93swo3StzuOdX7YDwmpkZqJcaAirsZr/B9tlMLYGAfgGPqOZfifyMGGWnKnx5HABug==",
       "dependencies": {
-        "@nextcloud/auth": "^2.2.1",
-        "@nextcloud/l10n": "^2.2.0",
-        "@nextcloud/logger": "^2.7.0",
+        "@nextcloud/auth": "^2.3.0",
+        "@nextcloud/l10n": "^3.1.0",
+        "@nextcloud/logger": "^3.0.2",
         "@nextcloud/paths": "^2.1.0",
-        "@nextcloud/router": "^3.0.0",
+        "@nextcloud/router": "^3.0.1",
         "cancelable-promise": "^4.3.1",
-        "is-svg": "^5.0.0",
-        "webdav": "^5.5.0"
-      },
-      "engines": {
-        "node": "^20.0.0",
-        "npm": "^9.0.0"
-      }
-    },
-    "node_modules/@nextcloud/files/node_modules/@nextcloud/l10n": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-2.2.0.tgz",
-      "integrity": "sha512-UAM2NJcl/NR46MANSF7Gr7q8/Up672zRyGrxLpN3k4URNmWQM9upkbRME+1K3T29wPrUyOIbQu710ZjvZafqFA==",
-      "dependencies": {
-        "@nextcloud/router": "^2.1.2",
-        "@nextcloud/typings": "^1.7.0",
-        "dompurify": "^3.0.3",
-        "escape-html": "^1.0.3",
-        "node-gettext": "^3.0.0"
-      },
-      "engines": {
-        "node": "^20.0.0",
-        "npm": "^9.0.0"
-      }
-    },
-    "node_modules/@nextcloud/files/node_modules/@nextcloud/l10n/node_modules/@nextcloud/router": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.0.tgz",
-      "integrity": "sha512-M4AVGnB5tt3MYO5RpH/R2jq7z/nW05AmRhk4Lh68krVwRIYGo8pgNikKrPGogHd2Q3UgzF5Py1drHz3uuV99bQ==",
-      "dependencies": {
-        "@nextcloud/typings": "^1.7.0",
-        "core-js": "^3.6.4"
+        "is-svg": "^5.0.1",
+        "webdav": "^5.6.0"
       },
       "engines": {
         "node": "^20.0.0",
-        "npm": "^9.0.0"
-      }
-    },
-    "node_modules/@nextcloud/files/node_modules/@nextcloud/logger": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.7.0.tgz",
-      "integrity": "sha512-DSJg9H1jT2zfr7uoP4tL5hKncyY+LOuxJzLauj0M/f6gnpoXU5WG1Zw8EFPOrRWjkC0ZE+NCqrMnITgdRRpXJQ==",
-      "dependencies": {
-        "@nextcloud/auth": "^2.0.0",
-        "core-js": "^3.6.4"
-      },
-      "engines": {
-        "node": "^20.0.0",
-        "npm": "^9.0.0"
+        "npm": "^10.0.0"
       }
     },
     "node_modules/@nextcloud/initial-state": {
@@ -4862,7 +4821,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
       "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
-      "optional": true,
       "engines": {
         "node": ">= 12"
       }
@@ -6922,7 +6880,6 @@
           "url": "https://paypal.me/jimmywarting"
         }
       ],
-      "optional": true,
       "dependencies": {
         "node-domexception": "^1.0.0",
         "web-streams-polyfill": "^3.0.3"
@@ -7208,7 +7165,6 @@
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
       "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "optional": true,
       "dependencies": {
         "fetch-blob": "^3.1.2"
       },
@@ -7776,6 +7732,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
       "bin": {
         "he": "bin/he"
       }
@@ -8421,9 +8378,9 @@
       }
     },
     "node_modules/is-svg": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-5.0.0.tgz",
-      "integrity": "sha512-sRl7J0oX9yUNamSdc8cwgzh9KBLnQXNzGmW0RVHwg/jEYjGNYHC6UvnYD8+hAeut9WwxRvhG9biK7g/wDGxcMw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-5.0.1.tgz",
+      "integrity": "sha512-mLYxDsfisQWdS4+gSblAwhATDoNMS/tx8G7BKA+aBIf7F0m1iUwMvuKAo6mW4WMleQAEE50I1Zqef9yMMfHk3w==",
       "dependencies": {
         "fast-xml-parser": "^4.1.3"
       },
@@ -10153,7 +10110,6 @@
           "url": "https://paypal.me/jimmywarting"
         }
       ],
-      "optional": true,
       "engines": {
         "node": ">=10.5.0"
       }
@@ -10162,7 +10118,6 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
       "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-      "optional": true,
       "dependencies": {
         "data-uri-to-buffer": "^4.0.0",
         "fetch-blob": "^3.1.4",
@@ -14887,32 +14842,32 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
       "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
-      "optional": true,
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/webdav": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.5.0.tgz",
-      "integrity": "sha512-SHSDe6n8lBuwwyX+uePB1N1Yn35ebd3locl/LbADMWpcEoowyFdIbnH3fv17T4Jf2tOa1Vwjr/Lld3t0dOio1w==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.6.0.tgz",
+      "integrity": "sha512-1zpC9T+nZAEz3hHrEdis3gybiwoR5LillHmFiylhYWAsGU0bGlWlRZtK5NJ3bTr2wCoKABrRGGqLk24+UxF4Gg==",
       "dependencies": {
         "@buttercup/fetch": "^0.2.1",
         "base-64": "^1.0.0",
         "byte-length": "^1.0.2",
+        "entities": "^4.5.0",
         "fast-xml-parser": "^4.2.4",
-        "he": "^1.2.0",
         "hot-patcher": "^2.0.0",
         "layerr": "^2.0.1",
         "md5": "^2.3.0",
         "minimatch": "^7.4.6",
         "nested-property": "^4.0.0",
+        "node-fetch": "^3.3.2",
         "path-posix": "^1.0.0",
         "url-join": "^5.0.0",
         "url-parse": "^1.5.10"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       }
     },
     "node_modules/webdav/node_modules/minimatch": {
diff --git a/package.json b/package.json
index 64b13be747..ed86e6a3c3 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "@nextcloud/axios": "^2.5.0",
     "@nextcloud/dialogs": "^5.3.1",
     "@nextcloud/event-bus": "^3.3.1",
+    "@nextcloud/files": "^3.2.1",
     "@nextcloud/initial-state": "^2.2.0",
     "@nextcloud/l10n": "^3.1.0",
     "@nextcloud/logger": "^3.0.2",
diff --git a/src/components/Questions/QuestionFile.vue b/src/components/Questions/QuestionFile.vue
new file mode 100644
index 0000000000..7685744f4c
--- /dev/null
+++ b/src/components/Questions/QuestionFile.vue
@@ -0,0 +1,325 @@
+<!--
+  - @copyright Copyright (c) 2024 Kostiantyn Miakshyn <molodchick@gmail.com>
+  -
+  - @author Kostiantyn Miakshyn <molodchick@gmail.com>
+  -
+  - @license AGPL-3.0-or-later
+  -
+  - 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/>.
+  -
+  -->
+
+<template>
+	<Question v-bind="questionProps"
+		:title-placeholder="answerType.titlePlaceholder"
+		:warning-invalid="answerType.warningInvalid"
+		v-on="commonListeners">
+		<template #actions>
+			<template v-if="!allowedFileTypesDialogOpened">
+				<NcActionButton is-menu @click="allowedFileTypesDialogOpened = true">
+					<template #icon>
+						<IconFileDocumentAlert :size="20" />
+					</template>
+					{{ allowedFileTypesLabel }}
+				</NcActionButton>
+			</template>
+
+			<template v-else>
+				<NcActionSeparator />
+
+				<NcActionButton @click="allowedFileTypesDialogOpened = false">
+					<template #icon>
+						<IconChevronLeft :size="20" />
+					</template>
+					{{ t('forms', 'Allow only specific file types') }}
+				</NcActionButton>
+
+				<NcActionCheckbox v-for="({ label: fileTypeLabel }, fileType) in fileTypes"
+					:key="fileType"
+					:checked="extraSettings?.allowedFileTypes?.includes(fileType)"
+					:value="fileType"
+					class="file-type-checkbox"
+					@update:checked="onAllowedFileTypesChange(fileType, $event)">
+					{{ fileTypeLabel }}
+				</NcActionCheckbox>
+
+				<NcActionInput :label="t('forms', 'Custom file extensions')"
+					type="multiselect"
+					multiple
+					taggable
+					:value="extraSettings?.allowedFileExtensions || []"
+					@option:created="onAllowedFileExtensionsAdded"
+					@option:deselected="onAllowedFileExtensionsDeleted" />
+
+				<NcActionSeparator />
+			</template>
+
+			<template v-if="!allowedFileTypesDialogOpened">
+				<NcActionInput type="number"
+					:value="maxAllowedFilesCount"
+					label-outside
+					:label="t('forms', 'Maximum number of files')"
+					:show-trailing-button="false"
+					@input="onMaxAllowedFilesCountInput($event.target.value)" />
+
+				<NcActionInput type="number"
+					:value="maxFileSizeValue"
+					label-outside
+					:show-trailing-button="false"
+					:label="t('forms', 'Maximum file size')"
+					@input="onMaxFileSizeValueInput($event.target.value)" />
+
+				<NcActionInput type="multiselect"
+					:value="maxFileSizeUnit"
+					:options="availableUnits"
+					required
+					:clearable="false"
+					@input="onMaxFileSizeUnitInput($event)" />
+			</template>
+		</template>
+
+		<div class="question__content">
+			<ul>
+				<NcListItem v-for="uploadedFile of values"
+					:key="uploadedFile.uploadedFileId"
+					:name="uploadedFile.fileName"
+					compact>
+					<template #icon>
+						<IconFile :size="20" />
+					</template>
+
+					<template #actions>
+						<NcActionButton class="delete-button-wrapper"
+							@click="onDeleteUploadedFile(uploadedFile.uploadedFileId)">
+							<template #icon>
+								<IconDelete :size="20" />
+							</template>
+							{{ t('forms', 'Delete') }}
+						</NcActionButton>
+					</template>
+				</NcListItem>
+			</ul>
+
+			<NcLoadingIcon v-show="fileLoading" />
+
+			<input v-show="!fileLoading"
+				ref="fileInput"
+				type="file"
+				:aria-label="t('forms', 'A file answer for the question “{text}”', { text })"
+				:disabled="!readOnly || values.length >= maxAllowedFilesCount"
+				:multiple="maxAllowedFilesCount > 1"
+				:name="name || undefined"
+				:accept="accept.length ? accept.join(',') : null"
+				@input="onFileInput" />
+		</div>
+	</Question>
+</template>
+
+<script>
+
+import IconChevronLeft from 'vue-material-design-icons/ChevronLeft.vue'
+import IconDelete from 'vue-material-design-icons/Delete.vue'
+import IconFile from 'vue-material-design-icons/File.vue'
+import IconFileDocumentAlert from 'vue-material-design-icons/FileDocumentAlert.vue'
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
+import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
+import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.js'
+import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+import OcsResponse2Data from '../../utils/OcsResponse2Data.js'
+import QuestionMixin from '../../mixins/QuestionMixin.js'
+import axios from '@nextcloud/axios'
+import fileTypes from '../../models/FileTypes.js'
+import logger from '../../utils/Logger.js'
+import { generateOcsUrl } from '@nextcloud/router'
+import { loadState } from '@nextcloud/initial-state'
+import { showError } from '@nextcloud/dialogs'
+import { formatFileSize } from '@nextcloud/files'
+
+const FILE_SIZE_UNITS = {
+	kb: 1024,
+	mb: 1024 ** 2,
+	gb: 1024 ** 3,
+}
+
+export default {
+	name: 'QuestionFile',
+	components: {
+		IconChevronLeft,
+		IconDelete,
+		IconFile,
+		IconFileDocumentAlert,
+		NcActionButton,
+		NcActionCheckbox,
+		NcActionInput,
+		NcActionSeparator,
+		NcListItem,
+		NcLoadingIcon,
+	},
+
+	mixins: [QuestionMixin],
+	data() {
+		return {
+			fileTypes,
+			fileLoading: false,
+			maxFileSizeUnit: Object.keys(FILE_SIZE_UNITS)[0],
+			maxFileSizeValue: '',
+			allowedFileTypesDialogOpened: false,
+		}
+	},
+
+	computed: {
+		availableUnits() {
+			return Object.keys(FILE_SIZE_UNITS)
+		},
+
+		maxAllowedFilesCount() {
+			return this.extraSettings?.maxAllowedFilesCount || 1
+		},
+
+		allowedFileTypesLabel() {
+			const allowedFileTypes = []
+			if (this.extraSettings?.allowedFileTypes?.length) {
+				allowedFileTypes.push(...this.extraSettings.allowedFileTypes.map(type => fileTypes[type].label))
+			}
+
+			if (this.extraSettings?.allowedFileExtensions?.length) {
+				allowedFileTypes.push(...this.extraSettings.allowedFileExtensions)
+			}
+
+			if (allowedFileTypes.length) {
+				return t('forms', 'Allowed file types: {fileTypes}.', { fileTypes: allowedFileTypes.join(', ') })
+			}
+
+			return t('forms', 'All file types are allowed.')
+		},
+	},
+
+	mounted() {
+		if (this.extraSettings.maxFileSize) {
+			Object.keys(FILE_SIZE_UNITS).forEach(unit => {
+				if (this.extraSettings.maxFileSize > FILE_SIZE_UNITS[unit]) {
+					this.maxFileSizeUnit = unit
+				}
+			})
+
+			this.maxFileSizeValue = this.extraSettings.maxFileSize / FILE_SIZE_UNITS[this.maxFileSizeUnit]
+		}
+	},
+
+	methods: {
+		async onFileInput() {
+			const fileInput = this.$refs.fileInput
+			const formData = new FormData()
+			let fileInvalid = false;
+
+			[...fileInput.files].forEach(file => {
+				formData.append('files[]', file)
+
+				if (this.extraSettings.maxFileSize > 0 && file.size > this.extraSettings.maxFileSize) {
+					showError(t('forms', 'The file {fileName} is too large. The maximum file size is {maxFileSize}.',
+						{ fileName: file.name, maxFileSize: formatFileSize(this.extraSettings.maxFileSize) }))
+
+					fileInvalid = true
+				}
+			})
+
+			if (fileInvalid) {
+				return
+			}
+
+			formData.append('shareHash', loadState('forms', 'shareHash', null))
+
+			const url = generateOcsUrl('apps/forms/api/v2.5/uploadFiles/{formId}/{questionId}', {
+				formId: this.formId,
+				questionId: this.id,
+			})
+
+			let response
+			try {
+				this.fileLoading = true
+				response = await axios.post(url, formData, { headers: { 'Content-Type': 'multipart/form-data' } })
+			} catch (error) {
+				logger.error('Error while submitting the form', { error })
+				showError(t('forms', 'There was an error during submitting the file: {message}.',
+					{ message: error.response.data.ocs.meta.message }))
+
+				return
+			} finally {
+				this.fileLoading = false
+				fileInput.value = null
+			}
+
+			this.$emit('update:values', [...this.values, ...OcsResponse2Data(response)])
+		},
+
+		onMaxAllowedFilesCountInput(maxAllowedFilesCount) {
+			return this.onExtraSettingsChange({ maxAllowedFilesCount: parseInt(maxAllowedFilesCount) })
+		},
+
+		onMaxFileSizeValueInput(maxFileSizeValue) {
+			this.maxFileSizeValue = maxFileSizeValue
+			const maxFileSize = Math.round(maxFileSizeValue * FILE_SIZE_UNITS[this.maxFileSizeUnit])
+
+			return this.onExtraSettingsChange({ maxFileSize })
+		},
+
+		onMaxFileSizeUnitInput(maxFileSizeUnit) {
+			this.maxFileSizeUnit = maxFileSizeUnit
+			const maxFileSize = Math.round(this.maxFileSizeValue * FILE_SIZE_UNITS[maxFileSizeUnit])
+
+			return this.onExtraSettingsChange({ maxFileSize })
+		},
+
+		onAllowedFileTypesChange(fileType, allowed) {
+			let allowedFileTypes = this.extraSettings.allowedFileTypes || []
+
+			if (allowed) {
+				allowedFileTypes.push(fileType)
+			} else {
+				allowedFileTypes = allowedFileTypes.filter(type => type !== fileType)
+			}
+
+			return this.onExtraSettingsChange({ allowedFileTypes })
+		},
+
+		onAllowedFileExtensionsAdded(fileExtension) {
+			const allowedFileExtensions = this.extraSettings.allowedFileExtensions || []
+			allowedFileExtensions.push(fileExtension)
+
+			return this.onExtraSettingsChange({ allowedFileExtensions })
+		},
+
+		onAllowedFileExtensionsDeleted(fileExtension) {
+			let allowedFileExtensions = this.extraSettings.allowedFileExtensions || []
+			allowedFileExtensions = allowedFileExtensions.filter(extension => extension !== fileExtension)
+
+			return this.onExtraSettingsChange({ allowedFileExtensions })
+		},
+
+		onDeleteUploadedFile(uploadedFileId) {
+			const values = this.values.filter(value => value.uploadedFileId !== uploadedFileId)
+
+			this.$emit('update:values', values)
+		},
+	},
+}
+</script>
+
+<style scoped>
+.file-type-checkbox {
+	margin-left: 30px;
+}
+</style>
diff --git a/src/components/Results/Answer.vue b/src/components/Results/Answer.vue
index af9436265e..a3020a116f 100644
--- a/src/components/Results/Answer.vue
+++ b/src/components/Results/Answer.vue
@@ -27,18 +27,39 @@
 		</h4>
 		<!-- Do not wrap the following line between tags! `white-space:pre-line` respects `\n` but would produce additional empty first line -->
 		<!-- eslint-disable-next-line -->
-		<p class="answer__text" dir="auto">{{ answerText }}</p>
+		<template v-if="answers.length">
+			<p v-for="answer of answers"
+				:key="answer.id"
+				class="answer__text"
+				dir="auto">
+				<a :href="answer.url" target="_blank"><IconFile :size="20" class="answer__text-icon" /> {{ answer.text }}</a>
+			</p>
+		</template>
+		<p v-else class="answer__text" dir="auto">
+			{{ answerText }}
+		</p>
 	</div>
 </template>
 
 <script>
+import IconFile from 'vue-material-design-icons/File.vue'
+
 export default {
 	name: 'Answer',
+	components: {
+		IconFile,
+	},
 
 	props: {
+		answers: {
+			type: Array,
+			required: false,
+			default: () => [],
+		},
 		answerText: {
 			type: String,
-			required: true,
+			required: false,
+			default: '',
 		},
 		questionText: {
 			type: String,
@@ -59,6 +80,12 @@ export default {
 
 	&__text {
 		white-space: pre-line;
+
+		&-icon {
+			display: inline-flex;
+			position: relative;
+			top: 4px;
+		}
 	}
 }
 
diff --git a/src/components/Results/ResultsSummary.vue b/src/components/Results/ResultsSummary.vue
index 7889fe3ca8..7dfef93e35 100644
--- a/src/components/Results/ResultsSummary.vue
+++ b/src/components/Results/ResultsSummary.vue
@@ -54,17 +54,30 @@
 		<ul v-else class="question-summary__text">
 			<!-- Do not wrap the following line between tags! `white-space:pre-line` respects `\n` but would produce additional empty first line -->
 			<!-- eslint-disable-next-line -->
-			<li v-for="answer in textAnswers" :key="answer.id" dir="auto">{{ answer }}</li>
+			<li v-for="answer in answers" :key="answer.id" dir="auto">
+				<template v-if="answer.url">
+					<a :href="answer.url" target="_blank"><IconFile :size="20" class="question-summary__text-icon" /> {{ answer.text }}</a>
+				</template>
+				<template v-else>
+					{{ answer.text }}
+				</template>
+			</li>
 		</ul>
 	</div>
 </template>
 
 <script>
 import answerTypes from '../../models/AnswerTypes.js'
+import { generateUrl } from '@nextcloud/router'
+import IconFile from 'vue-material-design-icons/File.vue'
 
 export default {
 	name: 'ResultsSummary',
 
+	components: {
+		IconFile,
+	},
+
 	props: {
 		submissions: {
 			type: Array,
@@ -152,8 +165,8 @@ export default {
 		},
 
 		// For text answers like short answer and long text
-		textAnswers() {
-			const textAnswers = []
+		answers() {
+			const answersModels = []
 
 			// Also record 'No response'
 			let noResponseCount = 0
@@ -168,15 +181,26 @@ export default {
 
 				// Add text answers
 				answers.forEach(answer => {
-					textAnswers.push(answer.text)
+					if (answer.fileId) {
+						answersModels.push({
+							id: answer.id,
+							text: answer.text,
+							url: generateUrl('/f/{fileId}', { fileId: answer.fileId }),
+						})
+					} else {
+						answersModels.push({
+							id: answer.id,
+							text: answer.text,
+						})
+					}
 				})
 			})
 
 			// Calculate no response percentage
 			const noResponsePercentage = Math.round((100 * noResponseCount) / this.submissions.length)
-			textAnswers.unshift(noResponseCount + ' (' + noResponsePercentage + '%): ' + t('forms', 'No response'))
+			answersModels.unshift({ id: 0, text: noResponseCount + ' (' + noResponsePercentage + '%): ' + t('forms', 'No response') })
 
-			return textAnswers
+			return answersModels
 		},
 	},
 }
@@ -212,6 +236,12 @@ export default {
 				font-weight: bold;
 			}
 		}
+
+		&-icon {
+			display: inline-flex;
+			position: relative;
+			top: 4px;
+		}
 	}
 
 	&__statistic {
diff --git a/src/components/Results/Submission.vue b/src/components/Results/Submission.vue
index 21f41e3c64..c9f2136eb7 100644
--- a/src/components/Results/Submission.vue
+++ b/src/components/Results/Submission.vue
@@ -42,6 +42,7 @@
 		<Answer v-for="question in answeredQuestions"
 			:key="question.id"
 			:answer-text="question.squashedAnswers"
+			:answers="question.answers"
 			:question-text="question.text" />
 	</div>
 </template>
@@ -53,6 +54,7 @@ import moment from '@nextcloud/moment'
 import IconDelete from 'vue-material-design-icons/Delete.vue'
 
 import Answer from './Answer.vue'
+import { generateUrl } from '@nextcloud/router'
 
 export default {
 	name: 'Submission',
@@ -99,13 +101,29 @@ export default {
 				if (!answers.length) {
 					return // no answers, go to next question
 				}
-				const squashedAnswers = answers.map(answer => answer.text).join('; ')
 
-				answeredQuestionsArray.push({
-					id: question.id,
-					text: question.text,
-					squashedAnswers,
-				})
+				if (question.type === 'file') {
+					answeredQuestionsArray.push({
+						id: question.id,
+						text: question.text,
+						answers: answers.map(answer => {
+							return {
+								id: answer.id,
+								text: answer.text,
+								url: generateUrl('/f/{fileId}', { fileId: answer.fileId }),
+							}
+						}),
+					})
+				} else {
+					const squashedAnswers = answers.map(answer => answer.text).join('; ')
+
+					answeredQuestionsArray.push({
+						id: question.id,
+						text: question.text,
+						squashedAnswers,
+					})
+				}
+
 			})
 			return answeredQuestionsArray
 		},
diff --git a/src/mixins/QuestionMixin.js b/src/mixins/QuestionMixin.js
index 5ba8feb6c1..1d09a5b4a5 100644
--- a/src/mixins/QuestionMixin.js
+++ b/src/mixins/QuestionMixin.js
@@ -155,6 +155,16 @@ export default {
 			},
 		},
 
+		/**
+		 * Mime-Types and file extensions that are allowed to be uploaded
+		 */
+		accept: {
+			type: Array,
+			default() {
+				return []
+			},
+		},
+
 		/**
 		 * Can question be moved up in order?
 		 */
diff --git a/src/models/AnswerTypes.js b/src/models/AnswerTypes.js
index 5268ef758e..e24044efd2 100644
--- a/src/models/AnswerTypes.js
+++ b/src/models/AnswerTypes.js
@@ -20,17 +20,19 @@
  *
  */
 
-import QuestionMultiple from '../components/Questions/QuestionMultiple.vue'
+import QuestionDate from '../components/Questions/QuestionDate.vue'
 import QuestionDropdown from '../components/Questions/QuestionDropdown.vue'
-import QuestionShort from '../components/Questions/QuestionShort.vue'
+import QuestionFile from '../components/Questions/QuestionFile.vue'
 import QuestionLong from '../components/Questions/QuestionLong.vue'
-import QuestionDate from '../components/Questions/QuestionDate.vue'
+import QuestionMultiple from '../components/Questions/QuestionMultiple.vue'
+import QuestionShort from '../components/Questions/QuestionShort.vue'
 
 import IconCheckboxOutline from 'vue-material-design-icons/CheckboxOutline.vue'
 import IconRadioboxMarked from 'vue-material-design-icons/RadioboxMarked.vue'
 import IconArrowDownDropCircleOutline from 'vue-material-design-icons/ArrowDownDropCircleOutline.vue'
 import IconTextShort from 'vue-material-design-icons/TextShort.vue'
 import IconTextLong from 'vue-material-design-icons/TextLong.vue'
+import IconFile from 'vue-material-design-icons/File.vue'
 import IconCalendar from 'vue-material-design-icons/Calendar.vue'
 import IconClockOutline from 'vue-material-design-icons/ClockOutline.vue'
 
@@ -104,6 +106,16 @@ export default {
 		warningInvalid: t('forms', 'This question needs a title and at least one answer!'),
 	},
 
+	file: {
+		component: QuestionFile,
+		icon: IconFile,
+		label: t('forms', 'File'),
+		predefined: false,
+
+		titlePlaceholder: t('forms', 'File question title'),
+		warningInvalid: t('forms', 'This question needs a title!'),
+	},
+
 	short: {
 		component: QuestionShort,
 		icon: IconTextShort,
diff --git a/src/models/FileTypes.js b/src/models/FileTypes.js
new file mode 100644
index 0000000000..a525ab6363
--- /dev/null
+++ b/src/models/FileTypes.js
@@ -0,0 +1,38 @@
+/**
+ * @copyright Copyright (c) 2023 Ferdinand Thiessen <rpm@fthiessen.de>
+ *
+ * @author Ferdinand Thiessen <rpm@fthiessen.de>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * 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/>.
+ *
+ */
+
+import { translate as t } from '@nextcloud/l10n'
+// !! Keep in SYNC with lib/Constants.php for supported file types \OCA\Forms\Constants::EXTRA_SETTINGS_ALLOWED_FILE_TYPES !!
+export default {
+	image: {
+		label: t('forms', 'Image'),
+	},
+	'x-office/document': {
+		label: t('forms', 'Document'),
+	},
+	'x-office/presentation': {
+		label: t('forms', 'Presentation'),
+	},
+	'x-office/spreadsheet': {
+		label: t('forms', 'Spreadsheet'),
+	},
+}
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 55cda06e14..9bf1acdcfe 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -95,7 +95,8 @@
 					<NcActions :aria-label="t('forms', 'Options')"
 						force-name
 						:inline="isMobile ? 0 : 1"
-						@blur="isDownloadActionOpened = false">
+						@blur="isDownloadActionOpened = false"
+						@close="isDownloadActionOpened = false">
 						<template v-if="!isDownloadActionOpened">
 							<template v-if="canEditForm && form.fileId">
 								<NcActionButton :href="fileUrl" type="tertiary-no-background">
diff --git a/src/views/Submit.vue b/src/views/Submit.vue
index 76126651c0..4e5a347cac 100644
--- a/src/views/Submit.vue
+++ b/src/views/Submit.vue
@@ -550,7 +550,8 @@ export default {
 				emit('forms:last-updated:set', this.form.id)
 			} catch (error) {
 				logger.error('Error while submitting the form', { error })
-				showError(t('forms', 'There was an error submitting the form'))
+				showError(t('forms', 'There was an error submitting the form: {message}',
+					{ message: error.response.data.ocs.meta.message }))
 			} finally {
 				this.loading = false
 			}
diff --git a/tests/Integration/Api/ApiV2Test.php b/tests/Integration/Api/ApiV2Test.php
index 2b6d53ae45..f3a49a86ff 100644
--- a/tests/Integration/Api/ApiV2Test.php
+++ b/tests/Integration/Api/ApiV2Test.php
@@ -37,6 +37,10 @@ class ApiV2Test extends IntegrationBase {
 	/** @var GuzzleHttp\Client */
 	private $http;
 
+	protected array $users = [
+		'test' => 'Test user',
+	];
+
 	/**
 	 * Store Test Forms Array.
 	 * Necessary as function due to object type-casting.
@@ -68,6 +72,7 @@ private function setTestForms() {
 						'name' => '',
 						'order' => 1,
 						'options' => [],
+						'accept' => [],
 						'extraSettings' => []
 					],
 					[
@@ -88,10 +93,26 @@ private function setTestForms() {
 								'text' => ''
 							]
 						],
+						'accept' => [],
 						'extraSettings' => [
 							'shuffleOptions' => true
 						]
-					]
+					],
+					[
+						'type' => 'file',
+						'text' => 'File Question?',
+						'description' => '',
+						'isRequired' => false,
+						'name' => 'file',
+						'order' => 3,
+						'options' => [],
+						'accept' => ['.txt'],
+						'extraSettings' => [
+							'allowedFileExtensions' => ['txt'],
+							'maxAllowedFilesCount' => 1,
+							'maxFileSize' => 1024,
+						],
+					],
 				],
 				'shares' => [
 					[
@@ -171,6 +192,7 @@ private function setTestForms() {
 						'name' => '',
 						'order' => 1,
 						'options' => [],
+						'accept' => [],
 						'extraSettings' => []
 					],
 				],
@@ -207,6 +229,7 @@ private function setTestForms() {
 						'name' => '',
 						'order' => 1,
 						'options' => [],
+						'accept' => [],
 						'extraSettings' => []
 					],
 				],
@@ -461,6 +484,7 @@ public function dataGetFullForm() {
 							'name' => '',
 							'order' => 1,
 							'options' => [],
+							'accept' => [],
 							'description' => 'Please answer this.',
 							'extraSettings' => []
 						],
@@ -481,11 +505,27 @@ public function dataGetFullForm() {
 									'text' => ''
 								]
 							],
+							'accept' => [],
 							'description' => '',
 							'extraSettings' => [
 								'shuffleOptions' => true,
 							]
-						]
+						],
+						[
+							'type' => 'file',
+							'text' => 'File Question?',
+							'isRequired' => false,
+							'name' => 'file',
+							'order' => 3,
+							'options' => [],
+							'accept' => ['.txt'],
+							'description' => '',
+							'extraSettings' => [
+								'allowedFileExtensions' => ['txt'],
+								'maxAllowedFilesCount' => 1,
+								'maxFileSize' => 1024,
+							],
+						],
 					],
 					'shares' => [
 						[
@@ -682,6 +722,7 @@ public function dataCreateNewQuestion() {
 					'text' => 'Already some Question?',
 					'name' => '',
 					'options' => [],
+					'accept' => [],
 					'description' => '',
 					'extraSettings' => [],
 				]
@@ -695,6 +736,7 @@ public function dataCreateNewQuestion() {
 					'text' => '',
 					'name' => '',
 					'options' => [],
+					'accept' => [],
 					'description' => '',
 					'extraSettings' => [],
 				]
@@ -794,7 +836,8 @@ public function testReorderQuestions(array $fullFormExpected): void {
 				'formId' => $this->testForms[0]['id'],
 				'newOrder' => [
 					$this->testForms[0]['questions'][1]['id'],
-					$this->testForms[0]['questions'][0]['id']
+					$this->testForms[0]['questions'][0]['id'],
+					$this->testForms[0]['questions'][2]['id'],
 				]
 			]
 		]);
@@ -803,7 +846,8 @@ public function testReorderQuestions(array $fullFormExpected): void {
 		$this->assertEquals(200, $resp->getStatusCode());
 		$this->assertEquals([
 			$this->testForms[0]['questions'][0]['id'] => [ 'order' => 2 ],
-			$this->testForms[0]['questions'][1]['id'] => [ 'order' => 1 ]
+			$this->testForms[0]['questions'][1]['id'] => [ 'order' => 1 ],
+			$this->testForms[0]['questions'][2]['id'] => [ 'order' => 3 ],
 		], $data);
 
 		$fullFormExpected['lastUpdated'] = time();
@@ -816,6 +860,7 @@ public function dataDeleteQuestion() {
 		$fullFormExpected = $this->dataGetFullForm()['getFullForm']['expected'];
 		array_splice($fullFormExpected['questions'], 0, 1);
 		$fullFormExpected['questions'][0]['order'] = 1;
+		$fullFormExpected['questions'][1]['order'] = 2;
 
 		return [
 			'deleteQuestion' => [
@@ -1068,12 +1113,14 @@ public function dataGetSubmissions() {
 								[
 									// 'submissionId' => Checked dynamically
 									// 'questionId' => Checked dynamically
-									'text' => 'This is a short answer.'
+									'text' => 'This is a short answer.',
+									'fileId' => null,
 								],
 								[
 									// 'submissionId' => Checked dynamically
 									// 'questionId' => Checked dynamically
-									'text' => 'Option 1'
+									'text' => 'Option 1',
+									'fileId' => null,
 								]
 							]
 						],
@@ -1086,12 +1133,14 @@ public function dataGetSubmissions() {
 								[
 									// 'submissionId' => Checked dynamically
 									// 'questionId' => Checked dynamically
-									'text' => 'This is another short answer.'
+									'text' => 'This is another short answer.',
+									'fileId' => null,
 								],
 								[
 									// 'submissionId' => Checked dynamically
 									// 'questionId' => Checked dynamically
-									'text' => 'Option 2'
+									'text' => 'Option 2',
+									'fileId' => null,
 								]
 							]
 						],
@@ -1104,7 +1153,8 @@ public function dataGetSubmissions() {
 								[
 									// 'submissionId' => Checked dynamically
 									// 'questionId' => Checked dynamically
-									'text' => ''
+									'text' => '',
+									'fileId' => null,
 								]
 							]
 						]
@@ -1159,10 +1209,10 @@ public function dataExportSubmissions() {
 		return [
 			'exportSubmissions' => [
 				'expected' => <<<'CSV'
-					"User ID","User display name","Timestamp","First Question?","Second Question?"
-					"","Anonymous user","1970-01-01T00:20:34+00:00","",""
-					"","Anonymous user","1970-01-01T03:25:45+00:00","This is another short answer.","Option 2"
-					"user1","User No. 1","1970-01-02T10:17:36+00:00","This is a short answer.","Option 1"
+					"User ID","User display name","Timestamp","First Question?","Second Question?","File Question?"
+					"","Anonymous user","1970-01-01T00:20:34+00:00","","",""
+					"","Anonymous user","1970-01-01T03:25:45+00:00","This is another short answer.","Option 2",""
+					"user1","User No. 1","1970-01-02T10:17:36+00:00","This is a short answer.","Option 1",""
 CSV
 			]
 		];
@@ -1266,6 +1316,22 @@ public function dataInsertSubmission() {
 	 * @param array $submissionsExpected
 	 */
 	public function testInsertSubmission(array $submissionsExpected) {
+
+		$uploadedFileResponse = $this->http->request('POST',
+			'api/v2.5/uploadFiles/'.$this->testForms[0]['id'].'/'.$this->testForms[0]['questions'][2]['id'],
+			[
+				'multipart' => [
+					[
+						'name' => 'files[]',
+						'contents' => 'hello world',
+						'filename' => 'test.txt'
+					]
+				]
+			]);
+
+		$data = $this->OcsResponse2Data($uploadedFileResponse);
+		$uploadedFileId = $data[0]['uploadedFileId'];
+
 		$resp = $this->http->request('POST', 'api/v2.4/submission/insert', [
 			'json' => [
 				'formId' => $this->testForms[0]['id'],
@@ -1273,7 +1339,8 @@ public function testInsertSubmission(array $submissionsExpected) {
 					$this->testForms[0]['questions'][0]['id'] => ['ShortAnswer!'],
 					$this->testForms[0]['questions'][1]['id'] => [
 						$this->testForms[0]['questions'][1]['options'][0]['id']
-					]
+					],
+					$this->testForms[0]['questions'][2]['id'] => [['uploadedFileId' => $uploadedFileId]]
 				]
 			]
 		]);
@@ -1306,12 +1373,19 @@ public function testInsertSubmission(array $submissionsExpected) {
 			'answers' => [
 				[
 					'questionId' => $this->testForms[0]['questions'][0]['id'],
-					'text' => 'ShortAnswer!'
+					'text' => 'ShortAnswer!',
+					'fileId' => null,
 				],
 				[
 					'questionId' => $this->testForms[0]['questions'][1]['id'],
-					'text' => 'Option 1'
-				]
+					'text' => 'Option 1',
+					'fileId' => null,
+				],
+				[
+					'questionId' => $this->testForms[0]['questions'][2]['id'],
+					'text' => 'test.txt',
+					'fileId' => 28,
+				],
 			]
 		], $data['submissions'][0]);
 	}
diff --git a/tests/Unit/BackgroundJob/CleanupUploadedFilesJobTest.php b/tests/Unit/BackgroundJob/CleanupUploadedFilesJobTest.php
new file mode 100644
index 0000000000..e00a49db03
--- /dev/null
+++ b/tests/Unit/BackgroundJob/CleanupUploadedFilesJobTest.php
@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2024 Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @author Kostiantyn Miakshyn <molodchick@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * 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\Tests\Unit\BackgroundJob;
+
+use OCA\Forms\BackgroundJob\CleanupUploadedFilesJob;
+use OCA\Forms\Db\Form;
+use OCA\Forms\Db\FormMapper;
+use OCA\Forms\Db\UploadedFile;
+use OCA\Forms\Db\UploadedFileMapper;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IRootFolder;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Test\TestCase;
+
+class CleanupUploadedFilesJobTest extends TestCase {
+	/** @var IRootFolder|MockObject */
+	private $rootFolder;
+
+	/** @var CleanupUploadedFilesJob */
+	private $cleanupUploadedFilesJob;
+
+	/** @var FormMapper|MockObject */
+	private $formMapper;
+
+	/** @var UploadedFileMapper|MockObject */
+	private $uploadedFileMapper;
+
+	/** @var LoggerInterface|MockObject */
+	private $logger;
+
+	public function setUp(): void {
+		parent::setUp();
+		$this->rootFolder = $this->createMock(IRootFolder::class);
+		$this->formMapper = $this->createMock(FormMapper::class);
+		$this->uploadedFileMapper = $this->createMock(UploadedFileMapper::class);
+		$time = $this->createMock(ITimeFactory::class);
+		$this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+		$this->cleanupUploadedFilesJob = new CleanupUploadedFilesJob(
+			$this->rootFolder,
+			$this->formMapper,
+			$this->uploadedFileMapper,
+			$this->logger,
+			$time,
+		);
+	}
+
+	public function testHandle() {
+		$form = new Form();
+		$form->setOwnerId('someUser');
+
+		$this->formMapper->expects($this->once())
+			->method('findById')
+			->willReturn($form);
+
+		$uploadedFile = new UploadedFile();
+		$uploadedFile->setOriginalFileName('test.txt');
+		$uploadedFile->setFormId(1);
+		$uploadedFile->setFileId(127);
+		$uploadedFile->setCreated(1711996822);
+
+		$this->uploadedFileMapper->expects($this->once())
+			->method('findUploadedEarlierThan')
+			->willReturn([$uploadedFile]);
+
+		$this->rootFolder->expects($this->atLeastOnce())
+			->method('getUserFolder')
+			->willReturn($this->rootFolder);
+
+		$this->cleanupUploadedFilesJob->run([]);
+	}
+}
diff --git a/tests/Unit/Controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
index abd0146f11..419cac9b35 100644
--- a/tests/Unit/Controller/ApiControllerTest.php
+++ b/tests/Unit/Controller/ApiControllerTest.php
@@ -43,6 +43,28 @@ function time($expected = null) {
 	return $value;
 }
 
+namespace OCA\Forms\Controller;
+
+/**
+ * mock is_uploaded_file() function used in services
+ * @param string|bool|null $filename the value that should be returned when called
+ */
+function is_uploaded_file(string|bool|null $filename) {
+	static $value;
+	if ($filename === false || $filename === true || $filename === null) {
+		$value = $filename;
+
+		return false;
+	}
+
+	if (is_null($value)) {
+		return \is_uploaded_file($filename);
+	}
+
+	return $value;
+}
+
+
 namespace OCA\Forms\Tests\Unit\Controller;
 
 use OCA\Forms\Constants;
@@ -56,6 +78,7 @@ function time($expected = null) {
 use OCA\Forms\Db\ShareMapper;
 use OCA\Forms\Db\Submission;
 use OCA\Forms\Db\SubmissionMapper;
+use OCA\Forms\Db\UploadedFileMapper;
 use OCA\Forms\Service\ConfigService;
 use OCA\Forms\Service\FormsService;
 use OCA\Forms\Service\SubmissionService;
@@ -66,6 +89,11 @@ function time($expected = null) {
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IRootFolder;
+use OCP\Files\Storage\IStorage;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUser;
@@ -105,6 +133,12 @@ class ApiControllerTest extends TestCase {
 	private $userManager;
 	/** @var IL10N|MockObject */
 	private $l10n;
+	/** @var IRootFolder|MockObject */
+	private $storage;
+	/** @var UploadedFileMapper|MockObject */
+	private $uploadedFileMapper;
+	/** @var IMimeTypeDetector|MockObject */
+	private $mimeTypeDetector;
 
 	public function setUp(): void {
 		$this->answerMapper = $this->createMock(AnswerMapper::class);
@@ -125,6 +159,10 @@ public function setUp(): void {
 			->willReturnCallback(function ($v) {
 				return $v;
 			});
+		$this->storage = $this->createMock(IRootFolder::class);
+		$this->uploadedFileMapper = $this->createMock(UploadedFileMapper::class);
+		$this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
+
 		$this->apiController = new ApiController(
 			'forms',
 			$this->request,
@@ -141,6 +179,9 @@ public function setUp(): void {
 			$this->l10n,
 			$this->logger,
 			$this->userManager,
+			$this->storage,
+			$this->uploadedFileMapper,
+			$this->mimeTypeDetector,
 		);
 	}
 
@@ -430,6 +471,9 @@ public function testCreateNewForm($expectedForm) {
 			 	$this->l10n,
 			 	$this->logger,
 			 	$this->userManager,
+			 	$this->storage,
+			 	$this->uploadedFileMapper,
+			 	$this->mimeTypeDetector,
 			 ])->getMock();
 		// Set the time that should be set for `lastUpdated`
 		\OCA\Forms\Controller\time(123456789);
@@ -587,6 +631,9 @@ public function testCloneForm($old, $new) {
 				$this->l10n,
 				$this->logger,
 				$this->userManager,
+				$this->storage,
+				$this->uploadedFileMapper,
+				$this->mimeTypeDetector,
 			])
 			->getMock();
 
@@ -626,11 +673,77 @@ public function testCloneQuestion_noPermission() {
 		$this->apiController->cloneQuestion(42);
 	}
 
+	public function testUploadFiles() {
+		$form = new Form();
+		$form->setId(1);
+		$form->setHash('hash');
+		$form->setOwnerId('currentUser');
+
+		$this->formMapper->expects($this->once())
+			->method('findById')
+			->with(1)
+			->willReturn($form);
+
+		$this->request->expects($this->once())
+			->method('getUploadedFile')
+			->with('files')
+			->willReturn([
+				'size' => [100],
+				'tmp_name' => [tempnam('/tmp', 'test')],
+				'name' => ['file.txt'],
+				'error' => [0],
+			]);
+
+		$this->formsService->expects($this->once())
+			->method('hasUserAccess')
+			->with($form)
+			->willReturn(true);
+
+		$this->formsService->expects($this->once())
+			->method('canSubmit')
+			->with($form)
+			->willReturn(true);
+
+		\OCA\Forms\Controller\is_uploaded_file(true);
+
+		$userFolder = $this->createMock(Folder::class);
+		$userFolder->expects($this->once())
+			->method('nodeExists')
+			->willReturn(true);
+
+		$storage = $this->createMock(IStorage::class);
+		$userFolder->expects($this->once())
+			->method('getStorage')
+			->willReturn($storage);
+
+		$file = $this->createMock(File::class);
+		$file->expects($this->once())
+			->method('getId')
+			->willReturn(100);
+
+		$folder = $this->createMock(Folder::class);
+		$folder->expects($this->once())
+			->method('newFile')
+			->willReturn($file);
+
+		$userFolder->expects($this->once())
+			->method('get')
+			->willReturn($folder);
+
+		$this->storage->expects($this->once())
+			->method('getUserFolder')
+			->with('currentUser')
+			->willReturn($userFolder);
+
+
+		$this->apiController->uploadFiles(1, 10, '');
+	}
+
 	public function testInsertSubmission_answers() {
 		$form = new Form();
 		$form->setId(1);
 		$form->setHash('hash');
-		$form->setOwnerId('99');
+		$form->setOwnerId('admin');
 		$form->setFileId(100);
 		$form->setFileFormat('xlsx');
 
@@ -656,13 +769,22 @@ public function testInsertSubmission_answers() {
 					['id' => 4, 'text' => 'test id 4'],
 				],
 			],
+			[
+				'id' => 4,
+				'name' => null,
+				'text' => 'Dummy file question',
+				'type' => Constants::ANSWER_TYPE_FILE,
+				'options' => [],
+				'extraSettings' => ['maxAllowedFilesCount' => 2],
+			],
 		];
 
 		$answers = [
 			1 => ['3'],
 			2 => ['2', '5', Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX . 'other answer'],
 			3 => ['short anwer'],
-			4 => ['ignore unknown question'],
+			4 => [['uploadedFileId' => 100]],
+			5 => ['ignore unknown question'],
 		];
 
 		$this->formMapper->expects($this->once())
@@ -688,7 +810,7 @@ public function testInsertSubmission_answers() {
 				return true;
 			}));
 
-		$this->answerMapper->expects($this->exactly(4))
+		$this->answerMapper->expects($this->exactly(5))
 			->method('insert')
 			->with($this->callback(function ($answer) {
 				if ($answer->getSubmissionId() !== 12) {
@@ -730,7 +852,29 @@ public function testInsertSubmission_answers() {
 
 		$this->submissionService->expects($this->once())
 			->method('writeFileToCloud')
-			->with($form, 'foo/bar', 'xlsx', '99');
+			->with($form, 'foo/bar', 'xlsx', 'admin');
+
+		$userFolder = $this->createMock(Folder::class);
+		$userFolder->expects($this->once())
+			->method('nodeExists')
+			->willReturn(true);
+
+		$file = $this->createMock(File::class);
+
+		$userFolder->expects($this->once())
+			->method('getById')
+			->willReturn([$file]);
+
+		$folder = $this->createMock(Folder::class);
+
+		$userFolder->expects($this->once())
+			->method('get')
+			->willReturn($folder);
+
+		$this->storage->expects($this->once())
+			->method('getUserFolder')
+			->with('admin')
+			->willReturn($userFolder);
 
 		$this->apiController->insertSubmission(1, $answers, '');
 	}
@@ -762,6 +906,7 @@ public function dataForCheckForbiddenException() {
 	public function testInsertSubmission_forbiddenException($hasUserAccess, $hasFormExpired, $canSubmit) {
 		$form = new Form();
 		$form->setId(1);
+		$form->setOwnerId('admin');
 
 		$this->formMapper->expects($this->once())
 			->method('findById')
@@ -782,6 +927,7 @@ public function testInsertSubmission_forbiddenException($hasUserAccess, $hasForm
 	public function testInsertSubmission_validateSubmission() {
 		$form = new Form();
 		$form->setId(1);
+		$form->setOwnerId('admin');
 
 		$this->formMapper->expects($this->once())
 			->method('findById')
@@ -956,7 +1102,7 @@ public function testTransferOwner() {
 			->method('get')
 			->with('newOwner')
 			->willReturn($newOwner);
-		
+
 		$this->assertEquals(new DataResponse('newOwner'), $this->apiController->transferOwner(1, 'newOwner'));
 		$this->assertEquals('newOwner', $form->getOwnerId());
 	}
diff --git a/tests/Unit/Controller/ShareApiControllerTest.php b/tests/Unit/Controller/ShareApiControllerTest.php
index 474b10baca..50042ae270 100644
--- a/tests/Unit/Controller/ShareApiControllerTest.php
+++ b/tests/Unit/Controller/ShareApiControllerTest.php
@@ -41,6 +41,9 @@
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IRequest;
@@ -48,6 +51,7 @@
 use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Security\ISecureRandom;
+use OCP\Share\IManager;
 use OCP\Share\IShare;
 
 use PHPUnit\Framework\MockObject\MockObject;
@@ -94,6 +98,12 @@ class ShareApiControllerTest extends TestCase {
 	/** @var CirclesService|MockObject */
 	private $circlesService;
 
+	/** @var IRootFolder|MockObject */
+	private $storage;
+
+	/** @var IManager|MockObject */
+	private $shareManager;
+
 	public function setUp(): void {
 		$this->formMapper = $this->createMock(FormMapper::class);
 		$this->shareMapper = $this->createMock(ShareMapper::class);
@@ -115,6 +125,9 @@ public function setUp(): void {
 			->method('getUser')
 			->willReturn($user);
 
+		$this->storage = $this->createMock(IRootFolder::class);
+		$this->shareManager = $this->createMock(IManager::class);
+
 		$this->shareApiController = new ShareApiController(
 			'forms',
 			$this->request,
@@ -127,7 +140,9 @@ public function setUp(): void {
 			$this->logger,
 			$this->userManager,
 			$this->secureRandom,
-			$this->circlesService
+			$this->circlesService,
+			$this->storage,
+			$this->shareManager,
 		);
 	}
 
@@ -209,7 +224,7 @@ public function testValidNewShare(int $shareType, string $shareWith, array $perm
 			->method('getCircle')
 			->with($shareWith)
 			->willReturn($this->createMock(Circle::class));
-		
+
 		$share = new Share();
 		$share->setFormId(5);
 		$share->setShareType($shareType);
@@ -472,7 +487,7 @@ public function testCirclesShare_circlesAppDisabled() {
 		$this->circlesService->expects($this->once())
 			->method('isCirclesEnabled')
 			->willReturn(false);
-		
+
 
 		$this->expectException(OCSException::class);
 
@@ -534,7 +549,7 @@ public function testDeleteShare() {
 		$this->shareMapper->expects($this->once())
 			->method('deleteById')
 			->with('8');
-		
+
 		$response = new DataResponse(8);
 		$this->assertEquals($response, $this->shareApiController->deleteShare(8));
 	}
@@ -761,6 +776,34 @@ public function testUpdateShare(array $share, string $formOwner, array $keyValue
 			->with('otherUser')
 			->willReturn($this->createMock(IUser::class));
 
+		$userFolder = $this->createMock(Folder::class);
+		$userFolder->expects($this->any())
+			->method('nodeExists')
+			->willReturn(true);
+
+		$file = $this->createMock(File::class);
+		$file->expects($this->any())
+			->method('getId')
+			->willReturn(100);
+
+		$folder = $this->createMock(Folder::class);
+		$folder->expects($this->any())
+			->method('newFile')
+			->willReturn($file);
+
+		$userFolder->expects($this->any())
+			->method('get')
+			->willReturn($folder);
+
+		$this->storage->expects($this->any())
+			->method('getUserFolder')
+			->with('currentUser')
+			->willReturn($userFolder);
+
+		$this->shareManager->expects($this->any())
+			->method('newShare')
+			->willReturn($this->createMock(IShare::class));
+
 		$shareEntity = new Share();
 		$shareEntity->setId($share['id']);
 		$shareEntity->setFormId($share['formId']);
@@ -793,7 +836,7 @@ public function testUpdateShare(array $share, string $formOwner, array $keyValue
 	 */
 	public function testUpdateShare_NotExistingShare() {
 		$exception = $this->createMock(MapperException::class);
-		
+
 		$this->shareMapper->expects($this->once())
 			->method('findById')
 			->with(1337)
@@ -811,7 +854,7 @@ public function testUpdateShare_NotExistingShare() {
 	 */
 	public function testUpdateShare_NotExistingForm() {
 		$exception = $this->createMock(MapperException::class);
-		
+
 		$share = new Share();
 		$share->setId(1337);
 		$share->setFormId(7331);
diff --git a/tests/Unit/Service/FormsServiceTest.php b/tests/Unit/Service/FormsServiceTest.php
index e07e3e8a8b..9debdc526c 100644
--- a/tests/Unit/Service/FormsServiceTest.php
+++ b/tests/Unit/Service/FormsServiceTest.php
@@ -22,6 +22,27 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+namespace OCA\Forms\Service;
+
+/**
+ * mock microtime() function used in services
+ * @param float|false|null $expected the value that should be returned when called
+ */
+function microtime(bool|float $asFloat = false) {
+	static $value;
+	if ($asFloat === -1) {
+		$value = null;
+	} elseif (is_numeric($asFloat)) {
+		$value = $asFloat;
+	}
+	// Return real time if no mocked value is set
+	if (is_null($value)) {
+		return \microtime($asFloat);
+	}
+	return $value;
+}
+
 namespace OCA\Forms\Tests\Unit\Service;
 
 use OCA\Circles\Model\Circle;
@@ -41,6 +62,7 @@
 use OCA\Forms\Service\ConfigService;
 use OCA\Forms\Service\FormsService;
 use OCP\Files\Folder;
+use OCP\Files\IMimeTypeDetector;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IGroup;
@@ -103,6 +125,9 @@ class FormsServiceTest extends TestCase {
 	/** @var IL10N|MockObject */
 	private $l10n;
 
+	/** @var IMimeTypeDetector|MockObject */
+	private $mimeTypeDetector;
+
 	public function setUp(): void {
 		parent::setUp();
 		$this->activityManager = $this->createMock(ActivityManager::class);
@@ -137,6 +162,8 @@ public function setUp(): void {
 				return $identity;
 			}));
 
+		$this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
+
 		$this->formsService = new FormsService(
 			$userSession,
 			$this->activityManager,
@@ -152,7 +179,8 @@ public function setUp(): void {
 			$this->secureRandom,
 			$this->circlesService,
 			$this->storage,
-			$this->l10n
+			$this->l10n,
+			$this->mimeTypeDetector,
 		);
 	}
 
@@ -209,7 +237,8 @@ public function dataGetForm() {
 								'questionId' => 1,
 								'text' => 'Option 2'
 							]
-						]
+						],
+						'accept' => [],
 					],
 					[
 						'id' => 2,
@@ -221,7 +250,8 @@ public function dataGetForm() {
 						'text' => 'Question 2',
 						'description' => '',
 						'name' => 'city',
-						'options' => []
+						'options' => [],
+						'accept' => [],
 					]
 				],
 				'shares' => [
@@ -623,7 +653,8 @@ public function testGetPermissions_NotLoggedIn() {
 			$this->secureRandom,
 			$this->circlesService,
 			$this->storage,
-			$this->l10n
+			$this->l10n,
+			$this->mimeTypeDetector,
 		);
 
 		$form = new Form();
@@ -862,7 +893,8 @@ public function testPublicCanSubmit() {
 			$this->secureRandom,
 			$this->circlesService,
 			$this->storage,
-			$this->l10n
+			$this->l10n,
+			$this->mimeTypeDetector,
 		);
 
 		$this->assertEquals(true, $formsService->canSubmit($form));
@@ -973,7 +1005,8 @@ public function testHasUserAccess_NotLoggedIn() {
 			$this->secureRandom,
 			$this->circlesService,
 			$this->storage,
-			$this->l10n
+			$this->l10n,
+			$this->mimeTypeDetector,
 		);
 
 		$form = new Form();
@@ -1200,7 +1233,8 @@ public function testNotifyNewSubmission($shares, $shareNotifications) {
 				$this->secureRandom,
 				$this->circlesService,
 				$this->storage,
-				$this->l10n
+				$this->l10n,
+				$this->mimeTypeDetector,
 			])
 			->getMock();
 
@@ -1411,4 +1445,28 @@ public function testGetFileName() {
 
 		$this->assertSame('Form 1 (responses).xlsx', $this->formsService->getFileName($form, 'xlsx'));
 	}
+
+	public function testGetUploadedFilePath() {
+		$form = new Form();
+		$form->setId(10);
+		$form->setTitle('Form 1');
+
+		$this->assertSame('forms/10 - Form 1/20/30 - question name',
+			$this->formsService->getUploadedFilePath($form, 20, 30, 'question name', 'question text'));
+	}
+
+	public function testGetTemporaryUploadedFilePath() {
+		$form = new Form();
+		$form->setId(10);
+		$form->setTitle('Form 1');
+
+		$question = new Question();
+		$question->setId(30);
+		$question->setName('question name');
+
+		\OCA\Forms\Service\microtime(1234567.89);
+
+		$this->assertSame('forms/unsubmitted/1234567.89/10 - Form 1/30 - question name',
+			$this->formsService->getTemporaryUploadedFilePath($form, $question));
+	}
 }
diff --git a/tests/Unit/Service/SubmissionServiceTest.php b/tests/Unit/Service/SubmissionServiceTest.php
index 5a6a5aa284..308e1e3c98 100644
--- a/tests/Unit/Service/SubmissionServiceTest.php
+++ b/tests/Unit/Service/SubmissionServiceTest.php
@@ -33,6 +33,7 @@
 use OCA\Forms\Db\QuestionMapper;
 use OCA\Forms\Db\Submission;
 use OCA\Forms\Db\SubmissionMapper;
+use OCA\Forms\Db\UploadedFileMapper;
 use OCA\Forms\Service\FormsService;
 use OCA\Forms\Service\SubmissionService;
 
@@ -43,6 +44,7 @@
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ITempManager;
+use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
@@ -93,6 +95,12 @@ class SubmissionServiceTest extends TestCase {
 	/** @var FormsService|MockObject */
 	private $formsService;
 
+	/** @var IURLGenerator|MockObject */
+	private $urlGenerator;
+
+	/** @var UploadedFileMapper|MockObject */
+	private $uploadedFileMapper;
+
 	public function setUp(): void {
 		parent::setUp();
 		$this->formMapper = $this->createMock(FormMapper::class);
@@ -123,6 +131,8 @@ public function setUp(): void {
 			}));
 
 		$this->formsService = $this->createMock(FormsService::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->uploadedFileMapper = $this->createMock(UploadedFileMapper::class);
 
 		$this->submissionService = new SubmissionService(
 			$this->formMapper,
@@ -137,7 +147,9 @@ public function setUp(): void {
 			$userSession,
 			$this->mailer,
 			$this->tempManager,
-			$this->formsService
+			$this->formsService,
+			$this->urlGenerator,
+			$this->uploadedFileMapper,
 		);
 	}
 
@@ -222,13 +234,15 @@ public function testGetSubmissions() {
 						'id' => 35,
 						'submissionId' => 42,
 						'questionId' => 422,
-						'text' => 'Just some Text'
+						'text' => 'Just some Text',
+						'fileId' => null,
 					],
 					[
 						'id' => 36,
 						'submissionId' => 42,
 						'questionId' => 423,
-						'text' => 'Just some more Text'
+						'text' => 'Just some more Text',
+						'fileId' => null,
 					]
 				]
 			],
@@ -348,7 +362,7 @@ public function dataGetSubmissionsData() {
 				// Questions
 				[
 					['id' => 1, 'text' => 'Question 1'],
-					['id' => 2, 'text' => 'Question 2']
+					['id' => 2, 'text' => 'Question 2'],
 				],
 				// Array of Submissions incl. Answers
 				[
@@ -402,6 +416,30 @@ public function dataGetSubmissionsData() {
 				"user1","User 1","1973-11-29T22:33:09+01:00","Q1A1; Q1A2; Q1A3"
 				'
 			],
+			'file-multi-answers' => [
+				// Questions
+				[
+					['id' => 1, 'type' => 'file', 'text' => 'Question 1']
+				],
+				// Array of Submissions incl. Answers
+				[
+					[
+						'id' => 1,
+						'userId' => 'user1',
+						'timestamp' => 123456789,
+						'answers' => [
+							['questionId' => 1, 'text' => 'file1.txt', 'fileId' => 1],
+							['questionId' => 1, 'text' => 'file2.txt', 'fileId' => 2],
+						]
+					],
+				],
+				// Expected CSV-Result
+				'
+				"User ID","User display name","Timestamp","Question 1"
+				"user1","User 1","1973-11-29T22:33:09+01:00","file1.txt; '.'
+file2.txt"
+				'
+			],
 			'anonymous-user' => [
 				// Questions
 				[
@@ -878,6 +916,6 @@ public function testValidateSubmission(array $questions, array $answers, bool $e
 			return $mail === 'some.name+context@example.com';
 		});
 
-		$this->assertEquals($expected, $this->submissionService->validateSubmission($questions, $answers));
+		$this->assertEquals($expected, $this->submissionService->validateSubmission($questions, $answers, 'admin'));
 	}
 };