diff --git a/lib/private/search/provider/file.php b/lib/private/search/provider/file.php
index a908276300225836bccef80bfc4e711ebf05bcaa..d5f167b730cbb7db8e37609af44262c89b3eacd2 100644
--- a/lib/private/search/provider/file.php
+++ b/lib/private/search/provider/file.php
@@ -43,7 +43,15 @@ class File extends \OC\Search\Provider {
 				continue;
 			}
 			// create folder result
-			if($fileData['mimetype'] === 'httpd/unix-directory'){
+			if($fileData['mimepart'] === 'audio'){
+				$result = new \OC\Search\Result\Audio($fileData);
+			}
+			// create image result
+			elseif($fileData['mimepart'] === 'image'){
+				$result = new \OC\Search\Result\Image($fileData);
+			}
+			// create audio result
+			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
 				$result = new \OC\Search\Result\Folder($fileData);
 			}
 			// or create file result
diff --git a/lib/search/result/audio.php b/lib/search/result/audio.php
new file mode 100644
index 0000000000000000000000000000000000000000..46f7396ec9fc9301c0847cacc3136192f92073b7
--- /dev/null
+++ b/lib/search/result/audio.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * ownCloud
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Result;
+
+/**
+ * A found audio file
+ */
+class Audio extends \OC\Search\Result\File {
+
+	/**
+	 * Type name; translated in templates
+	 * @var string 
+	 */
+	public $type = 'audio';
+	
+	/**
+	 * @TODO add ID3 information
+	 */
+}
diff --git a/lib/search/result/image.php b/lib/search/result/image.php
new file mode 100644
index 0000000000000000000000000000000000000000..ecc706fffe6f9612f9404b428c62b911c5684b86
--- /dev/null
+++ b/lib/search/result/image.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * ownCloud
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Result;
+
+/**
+ * A found image file
+ */
+class Image extends \OC\Search\Result\File {
+
+	/**
+	 * Type name; translated in templates
+	 * @var string 
+	 */
+	public $type = 'image';
+	
+	/**
+	 * @TODO add EXIF information
+	 */
+}