diff --git a/include/Photo.php b/include/Photo.php
index ba4241a7..de29dfb6 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -3,495 +3,681 @@
 if(! class_exists("Photo")) {
 class Photo {
 
-	private $image;
-	private $width;
-	private $height;
-	private $valid;
-	private $type;
-	private $types;
+    private $image;
+    private $ext;
 
-	/**
-	 * supported mimetypes and corresponding file extensions
-	 */
-	static function supportedTypes() {
-		$t = array();
-		$t['image/jpeg'] ='jpg';
-		if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
-		return $t;
-	}
+    /**
+     * Put back gd stuff, not everybody have Imagick
+     */
+    private $imagick;
+    private $width;
+    private $height;
+    private $valid;
+    private $type;
+    private $types;
 
-	public function __construct($data, $type="image/jpeg") {
+    /**
+     * supported mimetypes and corresponding file extensions
+     */
+    static function supportedTypes() {
+        if(class_exists('Imagick')) {
+            /**
+             * Imagick::queryFormats won't help us a lot there...
+             * At least, not yet, other parts of friendica uses this array
+             */
+            $t = array(
+                'image/jpeg' => 'jpg',
+                'image/png' => 'png',
+                'image/gif' => 'gif'
+            );
+        } else {
+            $t = array();
+            $t['image/jpeg'] ='jpg';
+            if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
+        }
 
-		$this->types = $this->supportedTypes();
-		if (!array_key_exists($type,$this->types)){
-			$type='image/jpeg';
-		}
-		$this->valid = false;
-		$this->type = $type;
-		$this->image = @imagecreatefromstring($data);
-		if($this->image !== FALSE) {
-			$this->width  = imagesx($this->image);
-			$this->height = imagesy($this->image);
-			$this->valid  = true;
-			imagealphablending($this->image, false);
-			imagesavealpha($this->image, true);
-		}
-	}
+        return $t;
+    }
 
-	public function __destruct() {
-		if($this->image)
-			imagedestroy($this->image);
-	}
+    public function __construct($data, $type=null) {
+        $this->imagick = class_exists('Imagick');
 
-	public function is_valid() {
-		return $this->valid;
-	}
+        if($this->is_imagick()) {
+            $this->image = new Imagick();
+            $this->image->readImageBlob($data);
 
-	public function getWidth() {
-		return $this->width;
-	}
+            // If it is a gif, it may be animated, get it ready for any future operations
+            if($this->image->getFormat() !== "GIF") $this->image = $this->image->coalesceImages();
 
-	public function getHeight() {
-		return $this->height;
-	}
+            $this->ext = strtolower($this->image->getImageFormat());
+        } else {
+            $this->types = $this->supportedTypes();
+            if (!array_key_exists($type,$this->types)){
+                $type='image/jpeg';
+            }
+            $this->valid = false;
+            $this->type = $type;
+            $this->image = @imagecreatefromstring($data);
+            if($this->image !== FALSE) {
+                $this->width  = imagesx($this->image);
+                $this->height = imagesy($this->image);
+                $this->valid  = true;
+                imagealphablending($this->image, false);
+                imagesavealpha($this->image, true);
+            }
+        }
+    }
 
-	public function getImage() {
-		return $this->image;
-	}
-	
-	public function getType() {
-		return $this->type;
-	}
-	public function getExt() {
-		return $this->types[$this->type];
-	}
+    public function __destruct() {
+        if($this->image) {
+            if($this->is_imagick()) {
+                $this->image->clear();
+                $this->image->destroy();
+                return;
+            }
+            imagedestroy($this->image);
+        }
+    }
 
-	public function scaleImage($max) {
+    public function is_imagick() {
+        return $this->imagick;
+    }
 
-		$width = $this->width;
-		$height = $this->height;
+    public function is_valid() {
+        if($this->is_imagick())
+            return ($this->image !== FALSE);
+        return $this->valid;
+    }
 
-		$dest_width = $dest_height = 0;
+    public function getWidth() {
+        if(!$this->is_valid())
+            return FALSE;
 
-		if((! $width)|| (! $height))
-			return FALSE;
+        if($this->is_imagick())
+            return $this->image->getImageWidth();
+        return $this->width;
+    }
 
-		if($width > $max && $height > $max) {
-			if($width > $height) {
-				$dest_width = $max;
-				$dest_height = intval(( $height * $max ) / $width);
-			}
-			else {
-				$dest_width = intval(( $width * $max ) / $height);
-				$dest_height = $max;
-			}
-		}
-		else {
-			if( $width > $max ) {
-				$dest_width = $max;
-				$dest_height = intval(( $height * $max ) / $width);
-			}
-			else {
-				if( $height > $max ) {
-					$dest_width = intval(( $width * $max ) / $height);
-					$dest_height = $max;
-				}
-				else {
-					$dest_width = $width;
-					$dest_height = $height;
-				}
-			}
-		}
+    public function getHeight() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick())
+            return $this->image->getImageHeight();
+        return $this->height;
+    }
+
+    public function getImage() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        /* Clean it */
+        if($this->is_imagick()) {
+            $this->image = $this->image->deconstructImages();
+            return $this->image;
+        }
+        return $this->image;
+    }
+
+    public function getType() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            // This should do the trick (see supportedTypes above)
+            return 'image/'. $this->getExt();
+        }
+        return $this->type;
+    }
+
+    public function getExt() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick())
+            return $this->ext;
+        return $this->types[$this->type];
+    }
+
+    public function scaleImage($max) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            /**
+             * If it is not animated, there will be only one iteration here,
+             * so don't bother checking
+             */
+            // Don't forget to go back to the first frame for any further operation
+            $this->image->setFirstIterator();
+            do {
+                $this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, true);
+            } while ($this->image->nextImage());
+            return;
+        }
+
+        $width = $this->width;
+        $height = $this->height;
+
+        $dest_width = $dest_height = 0;
+
+        if((! $width)|| (! $height))
+            return FALSE;
+
+        if($width > $max && $height > $max) {
+            if($width > $height) {
+                $dest_width = $max;
+                $dest_height = intval(( $height * $max ) / $width);
+            }
+            else {
+                $dest_width = intval(( $width * $max ) / $height);
+                $dest_height = $max;
+            }
+        }
+        else {
+            if( $width > $max ) {
+                $dest_width = $max;
+                $dest_height = intval(( $height * $max ) / $width);
+            }
+            else {
+                if( $height > $max ) {
+                    $dest_width = intval(( $width * $max ) / $height);
+                    $dest_height = $max;
+                }
+                else {
+                    $dest_width = $width;
+                    $dest_height = $height;
+                }
+            }
+        }
 
 
-		$dest = imagecreatetruecolor( $dest_width, $dest_height );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
+        $dest = imagecreatetruecolor( $dest_width, $dest_height );
+        imagealphablending($dest, false);
+        imagesavealpha($dest, true);
+        if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+        imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+        if($this->image)
+            imagedestroy($this->image);
+        $this->image = $dest;
+        $this->width  = imagesx($this->image);
+        $this->height = imagesy($this->image);
+    }
 
-	}
+    public function rotate($degrees) {
+        if(!$this->is_valid())
+            return FALSE;
 
-	public function rotate($degrees) {
-		$this->image  = imagerotate($this->image,$degrees,0);
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                $this->image->rotateImage(new ImagickPixel(), $degrees);
+            } while ($this->image->nextImage());
+            return;
+        }
 
-	public function flip($horiz = true, $vert = false) {
-		$w = imagesx($this->image);
-		$h = imagesy($this->image);
-		$flipped = imagecreate($w, $h);
-		if($horiz) {
-			for ($x = 0; $x < $w; $x++) {
-				imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
-			}
-		}
-		if($vert) {
-			for ($y = 0; $y < $h; $y++) {
-				imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
-			}
-		}
-		$this->image = $flipped;
-	}
+        $this->image  = imagerotate($this->image,$degrees,0);
+        $this->width  = imagesx($this->image);
+        $this->height = imagesy($this->image);
+    }
 
-	public function orient($filename) {
-		// based off comment on http://php.net/manual/en/function.imagerotate.php
+    public function flip($horiz = true, $vert = false) {
+        if(!$this->is_valid())
+            return FALSE;
 
-		if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
-			return;
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                if($horiz) $this->image->flipImage();
+                if($vert) $this->image->flopImage();
+            } while ($this->image->nextImage());
+            return;
+        }
 
-		$exif = exif_read_data($filename);
-		$ort = $exif['Orientation'];
+        $w = imagesx($this->image);
+        $h = imagesy($this->image);
+        $flipped = imagecreate($w, $h);
+        if($horiz) {
+            for ($x = 0; $x < $w; $x++) {
+                imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
+            }
+        }
+        if($vert) {
+            for ($y = 0; $y < $h; $y++) {
+                imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
+            }
+        }
+        $this->image = $flipped;
+    }
 
-		switch($ort)
-		{
-			case 1: // nothing
-	        	break;
+    public function orient($filename) {
+        // based off comment on http://php.net/manual/en/function.imagerotate.php
 
-	        case 2: // horizontal flip
-	            $this->flip();
-    		    break;
-                               
-	        case 3: // 180 rotate left
-            	$this->rotate(180);
-		        break;
-                   
-	        case 4: // vertical flip
-            	$this->flip(false, true);
-		        break;
-               
-	        case 5: // vertical flip + 90 rotate right
-            	$this->flip(false, true);
+        if(!$this->is_valid())
+            return FALSE;
+
+        if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
+            return;
+
+        $exif = exif_read_data($filename);
+        $ort = $exif['Orientation'];
+
+        switch($ort)
+        {
+            case 1: // nothing
+                break;
+
+            case 2: // horizontal flip
+                $this->flip();
+                break;
+
+            case 3: // 180 rotate left
+                $this->rotate(180);
+                break;
+
+            case 4: // vertical flip
+                $this->flip(false, true);
+                break;
+
+            case 5: // vertical flip + 90 rotate right
+                $this->flip(false, true);
                 $this->rotate(-90);
-		        break;
-               
-	        case 6: // 90 rotate right
-	            $this->rotate(-90);
-		        break;
-               
-	        case 7: // horizontal flip + 90 rotate right
-	            $this->flip();   
-	            $this->rotate(-90);
-		        break;
-               
-	        case 8:    // 90 rotate left
-	            $this->rotate(90);
-		        break;
-	    }
-	}
+                break;
+
+            case 6: // 90 rotate right
+                $this->rotate(-90);
+                break;
+
+            case 7: // horizontal flip + 90 rotate right
+                $this->flip();
+                $this->rotate(-90);
+                break;
+
+            case 8:    // 90 rotate left
+                $this->rotate(90);
+                break;
+        }
+    }
 
 
 
-	public function scaleImageUp($min) {
+    public function scaleImageUp($min) {
+        if(!$this->is_valid())
+            return FALSE;
 
-		$width = $this->width;
-		$height = $this->height;
+        if($this->is_imagick())
+            return $this->scaleImage($min);
 
-		$dest_width = $dest_height = 0;
+        $width = $this->width;
+        $height = $this->height;
 
-		if((! $width)|| (! $height))
-			return FALSE;
+        $dest_width = $dest_height = 0;
 
-		if($width < $min && $height < $min) {
-			if($width > $height) {
-				$dest_width = $min;
-				$dest_height = intval(( $height * $min ) / $width);
-			}
-			else {
-				$dest_width = intval(( $width * $min ) / $height);
-				$dest_height = $min;
-			}
-		}
-		else {
-			if( $width < $min ) {
-				$dest_width = $min;
-				$dest_height = intval(( $height * $min ) / $width);
-			}
-			else {
-				if( $height < $min ) {
-					$dest_width = intval(( $width * $min ) / $height);
-					$dest_height = $min;
-				}
-				else {
-					$dest_width = $width;
-					$dest_height = $height;
-				}
-			}
-		}
+        if((! $width)|| (! $height))
+            return FALSE;
+
+        if($width < $min && $height < $min) {
+            if($width > $height) {
+                $dest_width = $min;
+                $dest_height = intval(( $height * $min ) / $width);
+            }
+            else {
+                $dest_width = intval(( $width * $min ) / $height);
+                $dest_height = $min;
+            }
+        }
+        else {
+            if( $width < $min ) {
+                $dest_width = $min;
+                $dest_height = intval(( $height * $min ) / $width);
+            }
+            else {
+                if( $height < $min ) {
+                    $dest_width = intval(( $width * $min ) / $height);
+                    $dest_height = $min;
+                }
+                else {
+                    $dest_width = $width;
+                    $dest_height = $height;
+                }
+            }
+        }
 
 
-		$dest = imagecreatetruecolor( $dest_width, $dest_height );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-
-	}
+        $dest = imagecreatetruecolor( $dest_width, $dest_height );
+        imagealphablending($dest, false);
+        imagesavealpha($dest, true);
+        if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+        imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+        if($this->image)
+            imagedestroy($this->image);
+        $this->image = $dest;
+        $this->width  = imagesx($this->image);
+        $this->height = imagesy($this->image);
+    }
 
 
 
-	public function scaleImageSquare($dim) {
+    public function scaleImageSquare($dim) {
+        if(!$this->is_valid())
+            return FALSE;
 
-		$dest = imagecreatetruecolor( $dim, $dim );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                $this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, false);
+            } while ($this->image->nextImage());
+            return;
+        }
+
+        $dest = imagecreatetruecolor( $dim, $dim );
+        imagealphablending($dest, false);
+        imagesavealpha($dest, true);
+        if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+        imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
+        if($this->image)
+            imagedestroy($this->image);
+        $this->image = $dest;
+        $this->width  = imagesx($this->image);
+        $this->height = imagesy($this->image);
+    }
 
 
-	public function cropImage($max,$x,$y,$w,$h) {
-		$dest = imagecreatetruecolor( $max, $max );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
+    public function cropImage($max,$x,$y,$w,$h) {
+        if(!$this->is_valid())
+            return FALSE;
 
-	public function saveImage($path) {
-		switch($this->type){
-			case "image/png":
-				$quality = get_config('system','png_quality');
-				if((! $quality) || ($quality > 9))
-					$quality = PNG_QUALITY;
-				imagepng($this->image, $path, $quality);
-				break;
-			default:
-				$quality = get_config('system','jpeg_quality');
-				if((! $quality) || ($quality > 100))
-					$quality = JPEG_QUALITY;
-				imagejpeg($this->image,$path,$quality);
-		}
-		
-	}
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                $this->image->cropImage($w, $h, $x, $y);
+                /**
+                 * We need to remove the canva,
+                 * or the image is not resized to the crop:
+                 * http://php.net/manual/en/imagick.cropimage.php#97232
+                 */
+                $this->image->setImagePage(0, 0, 0, 0);
+            } while ($this->image->nextImage());
+            return $this->scaleImage($max);
+        }
 
-	public function imageString() {
-		ob_start();
-		switch($this->type){
-			case "image/png":
-				$quality = get_config('system','png_quality');
-				if((! $quality) || ($quality > 9))
-					$quality = PNG_QUALITY;
-				imagepng($this->image,NULL, $quality);
-				break;
-			default:
-				$quality = get_config('system','jpeg_quality');
-				if((! $quality) || ($quality > 100))
-					$quality = JPEG_QUALITY;
+        $dest = imagecreatetruecolor( $max, $max );
+        imagealphablending($dest, false);
+        imagesavealpha($dest, true);
+        if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+        imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
+        if($this->image)
+            imagedestroy($this->image);
+        $this->image = $dest;
+        $this->width  = imagesx($this->image);
+        $this->height = imagesy($this->image);
+    }
 
-				imagejpeg($this->image,NULL,$quality);
-		}
-		$s = ob_get_contents();
-		ob_end_clean();
-		return $s;
-	}
+    public function saveImage($path) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        $string = $this->imageString();
+        file_put_contents($path, $string);
+    }
+
+    public function imageString() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        $quality = FALSE;
+
+        /**
+         * Hmmm, for Imagick
+         * we should do the conversion/compression at the initialisation i think
+         * This method may be called several times,
+         * and there is no need to do that more than once
+         */
+
+        if(!$this->is_imagick()) ob_start();
+
+        switch($this->getType()){
+            case "image/png":
+                $quality = get_config('system','png_quality');
+                if((! $quality) || ($quality > 9))
+                    $quality = PNG_QUALITY;
+                if($this->is_imagick()) {
+                    /**
+                     * From http://www.imagemagick.org/script/command-line-options.php#quality:
+                     *
+                     * 'For the MNG and PNG image formats, the quality value sets
+                     * the zlib compression level (quality / 10) and filter-type (quality % 10).
+                     * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
+                     * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
+                     */
+                    $quality = $quality * 10;
+                } else imagepng($this->image,NULL, $quality);
+                break;
+            case "image/gif":
+                // We change nothing here, do we?
+                break;
+            default:
+                // Convert to jpeg by default
+                $quality = get_config('system','jpeg_quality');
+                if((! $quality) || ($quality > 100))
+                    $quality = JPEG_QUALITY;
+                if($this->is_imagick())
+                    $this->image->setImageFormat('jpeg');
+                else imagejpeg($this->image,NULL,$quality);
+        }
+
+        if($this->is_imagick()) {
+            if($quality !== FALSE) {
+            // Do we need to iterate for animations?
+            $this->image->setImageCompressionQuality($quality);
+            $this->image->stripImage();
+            }
+
+            $string = $this->image->getImagesBlob();
+        } else {
+            $string = ob_get_contents();
+            ob_end_clean();
+        }
+
+        return $string;
+    }
 
 
 
-	public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
+    public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
 
-		$r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
-			dbesc($rid)
-		);
-		if(count($r))
-			$guid = $r[0]['guid'];
-		else
-			$guid = get_guid();
+        $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
+            dbesc($rid)
+        );
+        if(count($r))
+            $guid = $r[0]['guid'];
+        else
+            $guid = get_guid();
 
-		$x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
-				dbesc($rid),
-				intval($uid),
-				intval($cid),
-				intval($scale)
-		);
-		if(count($x)) {
-			$r = q("UPDATE `photo`
-				set `uid` = %d, 
-				`contact-id` = %d, 
-				`guid` = '%s', 
-				`resource-id` = '%s', 
-				`created` = '%s',
-				`edited` = '%s', 
-				`filename` = '%s', 
-				`type` = '%s', 
-				`album` = '%s', 
-				`height` = %d, 
-				`width` = %d, 
-				`data` = '%s', 
-				`scale` = %d, 
-				`profile` = %d, 
-				`allow_cid` = '%s', 
-				`allow_gid` = '%s', 
-				`deny_cid` = '%s',
-				`deny_gid` = '%s' 
-				where id = %d limit 1",
+        $x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
+                dbesc($rid),
+                intval($uid),
+                intval($cid),
+                intval($scale)
+        );
+        if(count($x)) {
+            $r = q("UPDATE `photo`
+                set `uid` = %d,
+                `contact-id` = %d,
+                `guid` = '%s',
+                `resource-id` = '%s',
+                `created` = '%s',
+                `edited` = '%s',
+                `filename` = '%s',
+                `type` = '%s',
+                `album` = '%s',
+                `height` = %d,
+                `width` = %d,
+                `data` = '%s',
+                `scale` = %d,
+                `profile` = %d,
+                `allow_cid` = '%s',
+                `allow_gid` = '%s',
+                `deny_cid` = '%s',
+                `deny_gid` = '%s'
+                where id = %d limit 1",
 
-				intval($uid),
-				intval($cid),
-				dbesc($guid),
-				dbesc($rid),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc(basename($filename)),
-				dbesc($this->type),
-				dbesc($album),
-				intval($this->height),
-				intval($this->width),
-				dbesc($this->imageString()),
-				intval($scale),
-				intval($profile),
-				dbesc($allow_cid),
-				dbesc($allow_gid),
-				dbesc($deny_cid),
-				dbesc($deny_gid),
-				intval($x[0]['id'])
-			);
-		}
-		else {
-			$r = q("INSERT INTO `photo`
-				( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
-				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
-				intval($uid),
-				intval($cid),
-				dbesc($guid),
-				dbesc($rid),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc(basename($filename)),
-				dbesc($this->type),
-				dbesc($album),
-				intval($this->height),
-				intval($this->width),
-				dbesc($this->imageString()),
-				intval($scale),
-				intval($profile),
-				dbesc($allow_cid),
-				dbesc($allow_gid),
-				dbesc($deny_cid),
-				dbesc($deny_gid)
-			);
-		}
-		return $r;
-	}
+                intval($uid),
+                intval($cid),
+                dbesc($guid),
+                dbesc($rid),
+                dbesc(datetime_convert()),
+                dbesc(datetime_convert()),
+                dbesc(basename($filename)),
+                dbesc($this->getType()),
+                dbesc($album),
+                intval($this->getHeight()),
+                intval($this->getWidth()),
+                dbesc($this->imageString()),
+                intval($scale),
+                intval($profile),
+                dbesc($allow_cid),
+                dbesc($allow_gid),
+                dbesc($deny_cid),
+                dbesc($deny_gid),
+                intval($x[0]['id'])
+            );
+        }
+        else {
+            $r = q("INSERT INTO `photo`
+                ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
+                VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
+                intval($uid),
+                intval($cid),
+                dbesc($guid),
+                dbesc($rid),
+                dbesc(datetime_convert()),
+                dbesc(datetime_convert()),
+                dbesc(basename($filename)),
+                dbesc($this->getType()),
+                dbesc($album),
+                intval($this->getHeight()),
+                intval($this->getWidth()),
+                dbesc($this->imageString()),
+                intval($scale),
+                intval($profile),
+                dbesc($allow_cid),
+                dbesc($allow_gid),
+                dbesc($deny_cid),
+                dbesc($deny_gid)
+            );
+        }
+        return $r;
+    }
 }}
 
 
 /**
  * Guess image mimetype from filename or from Content-Type header
- * 
+ *
  * @arg $filename string Image filename
  * @arg $fromcurl boolean Check Content-Type header from curl request
  */
 function guess_image_type($filename, $fromcurl=false) {
     logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
-	$type = null;
-	if ($fromcurl) {
-		$a = get_app(); 
-		$headers=array();
-		$h = explode("\n",$a->get_curl_headers());
-		foreach ($h as $l) {
-			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-			$headers[$k] = $v;
-		}
-		if (array_key_exists('Content-Type', $headers))
-			$type = $headers['Content-Type'];
-	}
-	if (is_null($type)){
-		$ext = pathinfo($filename, PATHINFO_EXTENSION);
-		$types = Photo::supportedTypes();
-		$type = "image/jpeg";
-		foreach ($types as $m=>$e){
-			if ($ext==$e) $type = $m;
-		}
-
-	}
+    $type = null;
+    if ($fromcurl) {
+        $a = get_app();
+        $headers=array();
+        $h = explode("\n",$a->get_curl_headers());
+        foreach ($h as $l) {
+            list($k,$v) = array_map("trim", explode(":", trim($l), 2));
+            $headers[$k] = $v;
+        }
+        if (array_key_exists('Content-Type', $headers))
+            $type = $headers['Content-Type'];
+    }
+    if (is_null($type)){
+        // Guessing from extension? Isn't that... dangerous?
+        if($this->is_imagick()) {
+            /**
+             * Well, this not much better,
+             * but at least it comes from the data inside the image,
+             * we won't be tricked by a manipulated extension
+             */
+            $image = new Imagick($filename);
+            $type = 'image/'. strtolower($image->getImageFormat());
+        } else {
+            $ext = pathinfo($filename, PATHINFO_EXTENSION);
+            $types = Photo::supportedTypes();
+            $type = "image/jpeg";
+            foreach ($types as $m=>$e){
+                if ($ext==$e) $type = $m;
+            }
+        }
+    }
     logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
-	return $type;
-	
+    return $type;
+
 }
 
 function import_profile_photo($photo,$uid,$cid) {
 
-	$a = get_app();
+    $a = get_app();
 
-	$r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
-		intval($uid),
-		intval($cid)
-	);
-	if(count($r)) {
-		$hash = $r[0]['resource-id'];
-	}
-	else {
-		$hash = photo_new_resource();
-	}
-		
-	$photo_failure = false;
+    $r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
+        intval($uid),
+        intval($cid)
+    );
+    if(count($r)) {
+        $hash = $r[0]['resource-id'];
+    }
+    else {
+        $hash = photo_new_resource();
+    }
 
-	$filename = basename($photo);
-	$img_str = fetch_url($photo,true);
-	
-	// guess mimetype from headers or filename
-	$type = guess_image_type($photo,true);
+    $photo_failure = false;
 
-	
-	$img = new Photo($img_str, $type);
-	if($img->is_valid()) {
+    $filename = basename($photo);
+    $img_str = fetch_url($photo,true);
 
-		$img->scaleImageSquare(175);
-					
-		$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
+    if($this->is_imagick()) $type = null;
+    else {
+        // guess mimetype from headers or filename
+        $type = guess_image_type($photo,true);
+    }
+    $img = new Photo($img_str, $type);
+    if($img->is_valid()) {
 
-		if($r === false)
-			$photo_failure = true;
+        $img->scaleImageSquare(175);
 
-		$img->scaleImage(80);
+        $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
 
-		$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
+        if($r === false)
+            $photo_failure = true;
 
-		if($r === false)
-			$photo_failure = true;
+        $img->scaleImage(80);
 
-		$img->scaleImage(48);
+        $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
 
-		$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
+        if($r === false)
+            $photo_failure = true;
 
-		if($r === false)
-			$photo_failure = true;
+        $img->scaleImage(48);
 
-		$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
-		$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
-		$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
-	}
-	else
-		$photo_failure = true;
+        $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
 
-	if($photo_failure) {
-		$photo = $a->get_baseurl() . '/images/person-175.jpg';
-		$thumb = $a->get_baseurl() . '/images/person-80.jpg';
-		$micro = $a->get_baseurl() . '/images/person-48.jpg';
-	}
+        if($r === false)
+            $photo_failure = true;
 
-	return(array($photo,$thumb,$micro));
+        $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
+        $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
+        $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
+    }
+    else
+        $photo_failure = true;
+
+    if($photo_failure) {
+        $photo = $a->get_baseurl() . '/images/person-175.jpg';
+        $thumb = $a->get_baseurl() . '/images/person-80.jpg';
+        $micro = $a->get_baseurl() . '/images/person-48.jpg';
+    }
+
+    return(array($photo,$thumb,$micro));
 
 }