diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj
--- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj	2010-07-26 21:55:42.046875000 +0700
+++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki20/javacc/XWikiScanner.jj	2010-07-27 19:10:32.625000000 +0700
@@ -383,8 +383,9 @@
 	| <#IMAGE: "image:" ("~" ~[] | <XWIKI_CHAR> | <XWIKI_SPECIAL_SYMBOL> )* >
 	| <#ATTACH: "attach:" ("~" ~[] | <XWIKI_CHAR> | <XWIKI_SPECIAL_SYMBOL> )* > 
 
-	| <#XWIKI_URI: ( ( <XWIKI_URI_URIS> ( <URI_PATH_ABSOLUTE> | <URI_PATH_ROOTLESS> ) ) | <URI_SCHEME_COMPOSITE> "://" <URI_AUTHORITY> <URI_PATH_ABEMPTY> ) ("?" <URI_QUERY>)? ("#" <URI_FRAGMENT>)? >
-	| <#XWIKI_URI_URIS: "mailto:" >
+	| <#XWIKI_URI: ( ( <XWIKI_URI_URIS> ( <URI_PATH_ABSOLUTE> | <URI_PATH_ROOTLESS> ) ) | <XWIKI_URI_MAGNET> | <URI_SCHEME_COMPOSITE> "://" <URI_AUTHORITY> <URI_PATH_ABEMPTY> ) ("?" <URI_QUERY>)? ("#" <URI_FRAGMENT>)? >
+	| <#XWIKI_URI_URIS: ( "mailto:" | "xmpp:" ) >
+	| <#XWIKI_URI_MAGNET: "magnet:?" <URI_QUERY> ("#" <URI_FRAGMENT>)? >
 	| <#XWIKI_CHAR: <CHAR> | "~" <CHAR> >
         | <#EMPTY_LINE: <NEW_LINE> <NEW_LINE>>
 // <common-tokens>
diff -Nru wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj
--- wem-r477/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj	2010-07-26 21:55:43.281250000 +0700
+++ wem-r477-fixed/org.wikimodel.wem/src/main/java/org/wikimodel/wem/xwiki/xwiki21/javacc/XWikiScanner.jj	2010-07-27 19:11:02.453125000 +0700
@@ -383,8 +383,9 @@
 	| <#IMAGE: "image:" ("~" ~[] | <XWIKI_CHAR> | <XWIKI_SPECIAL_SYMBOL> )* >
 	| <#ATTACH: "attach:" ("~" ~[] | <XWIKI_CHAR> | <XWIKI_SPECIAL_SYMBOL> )* > 
 
-	| <#XWIKI_URI: ( ( <XWIKI_URI_URIS> ( <URI_PATH_ABSOLUTE> | <URI_PATH_ROOTLESS> ) ) | <URI_SCHEME_COMPOSITE> "://" <URI_AUTHORITY> <URI_PATH_ABEMPTY> ) ("?" <URI_QUERY>)? ("#" <URI_FRAGMENT>)? >
-	| <#XWIKI_URI_URIS: "mailto:" >
+	| <#XWIKI_URI: ( ( <XWIKI_URI_URIS> ( <URI_PATH_ABSOLUTE> | <URI_PATH_ROOTLESS> ) ) | <XWIKI_URI_MAGNET> | <URI_SCHEME_COMPOSITE> "://" <URI_AUTHORITY> <URI_PATH_ABEMPTY> ) ("?" <URI_QUERY>)? ("#" <URI_FRAGMENT>)? >
+	| <#XWIKI_URI_URIS: ( "mailto:" | "xmpp:" ) >
+	| <#XWIKI_URI_MAGNET: "magnet:?" <URI_QUERY> ("#" <URI_FRAGMENT>)? >
 	| <#XWIKI_CHAR: <CHAR> | "~" <CHAR> >
         | <#EMPTY_LINE: <NEW_LINE> <NEW_LINE>>
 // <common-tokens>
diff -Nru wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java
--- wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java	2010-07-26 21:55:32.218750000 +0700
+++ wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/MediawikiParserTest.java	2010-07-27 19:33:48.125000000 +0700
@@ -330,6 +330,8 @@
         test("[http://mediawiki.org MediaWiki]", "<p><a href='http://mediawiki.org'>MediaWiki</a></p>");
         test("[http://mediawiki.org]", "<p><a href='http://mediawiki.org' class='wikimodel-freestanding'>http://mediawiki.org</a></p>");
         test("[mailto:info@example.org email me]", "<p><a href='mailto:info@example.org'>email me</a></p>");
+        test("[xmpp:info@example.org chat with me]", "<p><a href='xmpp:info@example.org'>chat with me</a></p>");
+        test("[magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&xl=28257011&dn=gnat-gpl-2010-jvm-bin.exe Play with Ada]", "<p><a href='magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&#x26;xl=28257011&#x26;dn=gnat-gpl-2010-jvm-bin.exe'>Play with Ada</a></p>");
     }
 
     /**
diff -Nru wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java
--- wem-r477/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java	2010-07-26 21:55:32.203125000 +0700
+++ wem-r477-fixed/org.wikimodel.wem/src/test/java/org/wikimodel/wem/test/XWiki20ParserTest.java	2010-07-27 19:16:15.250000000 +0700
@@ -522,6 +522,9 @@
         test("before [[ [toto] [tata] ]] after", "<p>before <a href=' [toto] [tata] ' class='wikimodel-freestanding'> [toto] [tata] </a> after</p>");
         test("before wiki:Hello after", "<p>before wiki:Hello after</p>");
         test("before mailto:Hello after", "<p>before <a href='mailto:Hello' class='wikimodel-freestanding'>mailto:Hello</a> after</p>");
+        test("before xmpp:Hello after", "<p>before <a href='xmpp:Hello' class='wikimodel-freestanding'>xmpp:Hello</a> after</p>");
+        test("before magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&xl=28257011&dn=gnat-gpl-2010-jvm-bin.exe after", "<p>before <a href='magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&#x26;xl=28257011&#x26;dn=gnat-gpl-2010-jvm-bin.exe' class='wikimodel-freestanding'>magnet:?xt=urn:tree:tiger:ECSCCPON43XR3KRQHK7FN2MW52SF5PLUT3ZEFSQ&#x26;xl=28257011&#x26;dn=gnat-gpl-2010-jvm-bin.exe</a> after</p>");
+
         test("before wiki~:Hello after", "<p>before wiki:Hello after</p>");
 
         // Not a reference