Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 782)
+++ trunk/CHANGELOG	(revision 783)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.7.0 -------------------------------------
+31-Mar-2008 Christian Sommer
+#	fixed bug in output filter (mailto links with HTML entities in optional part)
 29-Mar-2008 Christian Sommer
 !	added missing translation to Dutch language file (thanks Bramus)
 28-Mar-2008 Thomas Hornik
Index: trunk/wb/modules/output_filter/filter-routines.php
===================================================================
--- trunk/wb/modules/output_filter/filter-routines.php	(revision 782)
+++ trunk/wb/modules/output_filter/filter-routines.php	(revision 783)
@@ -161,8 +161,10 @@
 				$decryption_key = chr($char_shift+97);						// ASCII a:=97
 		
 				// prepare mailto string for encryption (mail protocol, decryption key, mail address)
-				$email_address = "mailto:" .$decryption_key .$match[2] .$match[3];
-		
+				// match[3] contains the optional email subject and body text
+				// convert %XX values into characters and remove HTML entities like & into itīs expression like &
+				$email_address = "mailto:" .$decryption_key .$match[2] .html_entity_decode(rawurldecode($match[3]));
+
 				// encrypt email address by shifting characters
 		  	$encrypted_email = "";
 				for($i=0; $i<strlen($email_address); $i++) {