diff --git a/core/image.class.php b/core/image.class.php
index 26b7ee58..42655372 100644
--- a/core/image.class.php
+++ b/core/image.class.php
@@ -92,17 +92,17 @@ class Image {
 
 	public function get_image_link() {
 		global $config;
-		return $this->parse_link_template($config->get_string('image_ilink'));
+		return url_escape($this->parse_link_template($config->get_string('image_ilink')));
 	}
 
 	public function get_short_link() {
 		global $config;
-		return $this->parse_link_template($config->get_string('image_slink'));
+		return url_escape($this->parse_link_template($config->get_string('image_slink')));
 	}
 
 	public function get_thumb_link() {
 		global $config;
-		return $this->parse_link_template($config->get_string('image_tlink'));
+		return url_escape($this->parse_link_template($config->get_string('image_tlink')));
 	}
 
 	public function get_tooltip() {