diff --git a/ChangeLog b/ChangeLog
index 5514b3153..250dc4fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-14  Badlop  <badlop@process-one.net>
+
+	* src/mod_muc/mod_muc_log.erl: Linkify also xmpp:..., as it was
+	done previously (thanks to Konstantin Khomoutov)(EJAB-850)
+
 2009-03-20  Christophe Romain <christophe.romain@process-one.net>
 
 	* src/mod_caps.erl: Better handling of presence hook and caps clean
diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl
index f1fcbc18f..e531de96e 100644
--- a/src/mod_muc/mod_muc_log.erl
+++ b/src/mod_muc/mod_muc_log.erl
@@ -767,7 +767,7 @@ htmlize2(S1, NoFollow) ->
     S2 = element(2, regexp:gsub(S1, "\\&", "\\&amp;")),
     S3 = element(2, regexp:gsub(S2, "<", "\\&lt;")),
     S4 = element(2, regexp:gsub(S3, ">", "\\&gt;")),
-    S5 = element(2, regexp:gsub(S4, "(http|https|ftp|mailto|xmpp)://[^] )\'\"}]+",
+    S5 = element(2, regexp:gsub(S4, "((http|https|ftp)://|(mailto|xmpp):)[^] )\'\"}]+",
 				link_regexp(NoFollow))),
     %% Remove 'right-to-left override' unicode character 0x202e
     element(2, regexp:gsub(S5, [226,128,174], "[RLO]")).