diff --git a/framework/yii/base/Formatter.php b/framework/yii/base/Formatter.php
index 30df3c3559..33a6c1639e 100644
--- a/framework/yii/base/Formatter.php
+++ b/framework/yii/base/Formatter.php
@@ -190,7 +190,7 @@ class Formatter extends Component
 		if ($value === null) {
 			return $this->nullDisplay;
 		}
-		return Html::mailto($value);
+		return Html::mailto(Html::encode($value), $value);
 	}
 
 	/**