diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index e140bbea7..6c7478b68 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -68,8 +68,8 @@ class MailTo extends Plugin {
 		$content = "";
 		$tpl->generateOutputToString($content);
 
-		$mailto_link = htmlspecialchars("mailto: ?subject=".urlencode($subject).
-			"&body=".urlencode($content));
+		$mailto_link = htmlspecialchars("mailto: ?subject=".rawurlencode($subject).
+			"&body=".rawurlencode($content));
 
 		print __("Clicking the following link to invoke your mail client:");