diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index c16c9d0..a47db8f 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1046
\ No newline at end of file
+1048
\ No newline at end of file
diff --git a/Common/UBBParser.cs b/Common/UBBParser.cs
index e28d999..3ebddaf 100644
--- a/Common/UBBParser.cs
+++ b/Common/UBBParser.cs
@@ -158,7 +158,7 @@ namespace FLocal.Common {
 		}
 
 		public static string UBBToIntermediate(string UBB) {
-			//return HttpUtility.HtmlEncode(UBB).Replace("\r\n", "<br/>\r\n");
+			//return HttpUtility.HtmlEncode(UBB).Replace(Util.EOL, "<br/>" + Util.EOL);
 			return BBParserGateway.instance.Parse(UBB);
 		}
 
diff --git a/Common/dataobjects/Post.cs b/Common/dataobjects/Post.cs
index 88ed8ad..a60b0d3 100644
--- a/Common/dataobjects/Post.cs
+++ b/Common/dataobjects/Post.cs
@@ -564,7 +564,7 @@ namespace FLocal.Common.dataobjects {
 							account,
 							posterAccount,
 							this.title,
-							String.Format("{0}\r\n[post]{2}[/post]\r\n{1}", type.description, comment, this.id)
+							String.Format("{0}{3}[post]{2}[/post]{3}{1}", type.description, comment, this.id, Util.EOL)
 						);
 						newMessage.conversation.markAsRead(account, newMessage, newMessage);
 					}