diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 292b7de..ab782e0 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.2.524")]
-[assembly: AssemblyFileVersion("3.0.2.524")]
+[assembly: AssemblyVersion("3.0.2.525")]
+[assembly: AssemblyFileVersion("3.0.2.525")]
diff --git a/Core/Formatter.cs b/Core/Formatter.cs
index 2a3d9a3..b226cd7 100644
--- a/Core/Formatter.cs
+++ b/Core/Formatter.cs
@@ -1702,7 +1702,11 @@ namespace ScrewTurn.Wiki {
 				sb.Append(@"<a");
 				if(!isImage) sb.Append(@" class=""emaillink""");
 				if(blank) sb.Append(@" target=""_blank""");
-				sb.Append(@" href=""mailto:");
+				if(targetUrl.StartsWith(@"mailto:")) {
+					sb.Append(@" href=""");
+				} else {
+					sb.Append(@" href=""mailto:");
+				}
 				sb.Append(Tools.ObfuscateText(targetUrl.Replace("&amp;", "%26"))); // Trick to let ampersands work in email addresses
 				sb.Append(@""" title=""");
 				if(!isImage && title.Length > 0) sb.Append(nstripped);