diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php
index 2481e743783f0663ba6d3591524e57f05d58e837..f5fac0b83668186a4b3e8a4f96db9eb1d91ec35d 100644
--- a/lib/preview/mp3.php
+++ b/lib/preview/mp3.php
@@ -5,14 +5,30 @@
  * later.
  * See the COPYING-README file.
  */
+require_once('getid3/getid3.php');
+
 class OC_Preview_MP3 extends OC_Preview_Provider{
 
 	public function getMimeType(){
 		return '/audio\/mpeg/';
 	}
 
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {	
+	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+		$getID3 = new getID3(); 
+		//Todo - add stream support
+		$tags = $getID3->analyze($fileview->getLocalFile($path)); 
+		getid3_lib::CopyTagsToComments($tags); 
+		$picture = @$tags['id3v2']['APIC'][0]['data'];
+		
+		$image = new \OC_Image($picture);
+		if (!$image->valid()) return $this->getNoCoverThumbnail($maxX, $maxY);
 		
+		return $image;
+	}
+	
+	public function getNoCoverThumbnail($maxX, $maxY){
+		$image = new \OC_Image();
+		return $image;
 	}
 
 }