diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 7777490a1cd23585ea4a92b6b9dda63642405a09..57e9621e1de927b30371eb0ea858cb99cf790cf3 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -649,7 +649,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['style']  = '';
         $link['more']   = '';
 
-        $name = $this->_getLinkTitle($name, $address, $isImage);
+        $name = $this->_getLinkTitle($name, '', $isImage);
         if ( !$isImage ) {
             $link['class']='mail JSnocheck';
         } else {
@@ -663,9 +663,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if(empty($name)){
             $name = $address;
         }
-#elseif($isImage{
-#            $name = $this->_xmlEntities($name);
-#        }
 
         if($conf['mailguard'] == 'visible') $address = rawurlencode($address);