diff --git a/app/Utils.inc b/app/Utils.inc
index 6f0475df..b1a97b2d 100644
--- a/app/Utils.inc
+++ b/app/Utils.inc
@@ -107,6 +107,34 @@
 			return mail($to, $subject, $message, $header);
 		}
 		
+		
+		/**
+		 * Detect Mimetype of a file.
+		 * 
+		 * @param	string	$filename		Name of file to detect Mimetype of
+		 * @param	string	$defaultMimetype	Default Mimetype to use
+		 * @return	string				Detected Mimetype of file
+		 */
+		public static function getMimetype($filename, $defaultMimetype=null)
+		{
+			$mimetype = (!is_null($defaultMimetype)) ? $defaultMimetype : 'application/octet-stream';
+			// Use Fileinfo
+			if(class_exists('\finfo'))
+			{
+				$finfo = new \finfo(FILEINFO_MIME_TYPE);
+				if(!is_null($finfo)) {
+					$mimetype = $finfo->file($filename);
+				}
+			}
+			// Use deprecated mime_content_type()
+			elseif(function_exists('mime_content_type')) {
+				$mimetype = mime_content_type($filename);
+			}
+			
+			
+			return $mimetype;
+		}
+		
 	}
 
 ?>
diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc
index 7c08acc2..08aab869 100644
--- a/controllers/CharactergroupsquestsController.inc
+++ b/controllers/CharactergroupsquestsController.inc
@@ -153,14 +153,15 @@
 					
 					// Check mimetype
 					$mediaMimetype = null;
+					$file['mimetype'] = \hhu\z\Utils::getMimetype($file['tmp_name']);
 					foreach($mimetypes as &$mimetype) {
-						if($mimetype['mimetype'] == $file['type']) {
+						if($mimetype['mimetype'] == $file['mimetype']) {
 							$mediaMimetype = $mimetype;
 							break;
 						}
 					}
 					if(is_null($mediaMimetype)) {
-						$validation = $this->Validation->addValidationResult($validation, 'media', 'mimetype', $file['type']);
+						$validation = $this->Validation->addValidationResult($validation, 'media', 'mimetype', $file['mimetype']);
 					}
 					elseif($file['size'] > $mediaMimetype['size']) {
 						$validation = $this->Validation->addValidationResult($validation, 'media', 'size', $mediaMimetype['size']);
diff --git a/questtypes/submit/SubmitQuesttypeController.inc b/questtypes/submit/SubmitQuesttypeController.inc
index 008b71e6..ed78529f 100644
--- a/questtypes/submit/SubmitQuesttypeController.inc
+++ b/questtypes/submit/SubmitQuesttypeController.inc
@@ -56,15 +56,16 @@
 				// Check mimetype
 				$mimetypes = $this->Submit->getAllowedMimetypes($seminary['id']);
 				$answerMimetype = null;
+				$answer['mimetype'] = \hhu\z\Utils::getMimetype($answer['tmp_name']);
 				foreach($mimetypes as &$mimetype) {
-					if($mimetype['mimetype'] == $answer['type']) {
+					if($mimetype['mimetype'] == $answer['mimetype']) {
 						$answerMimetype = $mimetype;
 						break;
 					}
 				}
 				if(is_null($answerMimetype)) {
 					throw new \hhu\z\exceptions\SubmissionNotValidException(
-						new \hhu\z\exceptions\WrongFiletypeException($answer['type'])
+						new \hhu\z\exceptions\WrongFiletypeException($answer['mimetype'])
 					);
 				}