diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index f0236b5..64e9c64 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1215
\ No newline at end of file
+1219
\ No newline at end of file
diff --git a/Common/UBBParser.cs b/Common/UBBParser.cs
index 4abc6e2..9f072a9 100644
--- a/Common/UBBParser.cs
+++ b/Common/UBBParser.cs
@@ -63,7 +63,9 @@ namespace FLocal.Common {
 
 				private static readonly Regex LINKS_MATCHER = new Regex("https?://[^\\s\\[<]+", RegexOptions.Singleline | RegexOptions.Compiled);
 				private static string LINKS_REPLACE(Match match) {
-					return BBCodes.UrlProcessor.ProcessLink(match.Value, null, true);
+					string url = match.Value.TrimEnd('!', '?', ',', '.');
+					string remainder = match.Value.Substring(url.Length);
+					return BBCodes.UrlProcessor.ProcessLink(url, null, true) + remainder;
 				}
 
 				private static readonly Dictionary<Regex, MatchEvaluator> TYPOGRAPHICS = new Dictionary<Regex, MatchEvaluator> {